obadz 78b7529ee3 Merge branch 'master' into staging		2016-08-24 11:57:44 +01:00
..
applications	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
build-support	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
data	Merge pull request #17847 from DamienCassou/cantarell-0.0.25	2016-08-23 10:51:26 +02:00
desktops	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
development	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
games	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
misc	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
os-specific	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
servers	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
shells	Merge branch 'master' into hardened-stdenv	2016-08-13 16:59:55 +02:00
stdenv	Partially revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"	2016-08-21 15:26:51 +01:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
top-level	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00