Vladimír Čunát 0be2928ac9 Merge branch 'master' into staging ... Evaluation was blocked on Hydra; this should fix it.		2017-10-05 12:34:05 +02:00
..
applications	Merge branch 'master' into staging	2017-10-05 12:34:05 +02:00
build-support	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
desktops	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
development	Merge branch 'master' into staging	2017-10-05 12:34:05 +02:00
games	Merge branch 'master' into staging	2017-10-02 00:22:12 +00:00
misc	Merge branch 'master' into staging	2017-10-03 17:46:39 +00:00
os-specific	Merge branch 'master' into staging	2017-10-05 07:41:39 +00:00
servers	Merge branch 'master' into staging	2017-10-05 12:34:05 +02:00
shells	oh-my-zsh: 2017-06-22 -> 2017-09-24	2017-09-26 08:59:08 -04:00
stdenv	Merge branch 'cc-wrapper-stdenvNoCC' into ericson2314-cross-base	2017-09-28 19:12:31 -04:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge branch 'master' into staging	2017-10-05 12:34:05 +02:00
top-level	Merge branch 'master' into staging	2017-10-05 12:34:05 +02:00