Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master'		2016-03-31 10:06:30 +02:00
..
applications	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
build-support	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-03-30 09:01:20 +00:00
development	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
games	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-03-30 09:01:20 +00:00
misc	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-03-28 15:16:29 +00:00
os-specific	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
servers	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
shells	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-03-28 15:16:29 +00:00
stdenv	Merge remote-tracking branch 'origin/staging'	2016-03-27 13:19:04 +01:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00
top-level	Merge remote-tracking branch 'origin/master'	2016-03-31 10:06:30 +02:00