Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9 ... Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/development/libraries/wayland/default.nix pkgs/development/tools/build-managers/cmake/default.nix pkgs/top-level/all-packages.nix		2015-06-01 20:08:43 +02:00
..
applications	Merge branch 'master' into staging	2015-06-01 11:00:51 +02:00
build-support	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
data
desktops	Merge branch 'master' into staging	2015-06-01 11:00:51 +02:00
development	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
games
misc
os-specific	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
servers	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
shells
stdenv	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
test
tools	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00
top-level	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00