Vladimír Čunát 422adc3063 Merge branch 'staging' ... 10k staging builds are not yet finished on Hydra (mostly darwin), but we now have a 20k jobs rebuilding directly on master, so we would never get to merge this way...		2017-09-12 19:17:52 +02:00
..
applications	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
build-support	Merge remote-tracking branch 'upstream/master' into HEAD	2017-09-11 22:52:53 +02:00
common-updater
data	Merge pull request #28964 from chrisburr/patch-2	2017-09-12 09:42:33 +01:00
desktops	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
development	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
games	scorched3d: fixing build with gcc6	2017-09-08 15:08:00 +02:00
misc	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2017-09-11 22:52:53 +02:00
servers	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
shells	grml-zsh-config: generalize support to unix systems	2017-09-01 11:38:38 +03:00
stdenv	stdenv bootstrap: fix evaluation	2017-09-10 11:16:47 +02:00
test	nixpkgs-tests: add basic test for buildInputs	2017-09-10 22:49:47 +02:00
tools	Merge branch 'staging'	2017-09-12 19:17:52 +02:00
top-level	Merge branch 'staging'	2017-09-12 19:17:52 +02:00