nixpkgs/pkgs
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 Fixed meta.license: s/licence/license 2015-05-30 15:19:05 +02:00
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 minetest: LuaJIT, in-app mod store, better fonts and enable translations 2015-05-31 11:36:56 -05:00
misc vim-plugins: vim-wakatime -> 4.0.1 2015-06-01 04:04:33 +02:00
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 cygwin: bash updated to 4.3 for cygwin platform 2015-05-29 10:18:06 +02:00
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