Tuomas Tynkkynen 19225bf5cc Merge remote-tracking branch 'upstream/master' into staging		2016-10-02 10:36:47 +03:00
..
applications	treewide: Fix more lib.optional misuses	2016-10-02 00:44:10 +03:00
build-support	runCommand: Use stdenvNoCC	2016-09-29 13:06:43 +02:00
data	Merge remote-tracking branch 'upstream/master' into staging	2016-10-02 10:36:47 +03:00
desktops	Merge pull request #18988 from groxxda/cogl-cleanup	2016-10-01 09:18:32 +02:00
development	Merge remote-tracking branch 'upstream/master' into staging	2016-10-02 10:36:47 +03:00
games	treewide: Fix more 'lib.optional' misuses	2016-10-02 00:44:10 +03:00
misc	cups-kyocera: fix downloading of source	2016-10-01 23:41:46 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2016-10-02 10:36:47 +03:00
servers	treewide: Fix more lib.optional misuses	2016-10-02 00:44:10 +03:00
shells	Merge remote-tracking branch 'origin/master' into staging	2016-09-29 13:06:14 +02:00
stdenv
test
tools	Merge remote-tracking branch 'upstream/master' into staging	2016-10-02 10:36:47 +03:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2016-10-02 10:36:47 +03:00