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
..
default.nix	Merge remote-tracking branch 'origin/staging' into gcc-4.9	2015-06-01 20:08:43 +02:00