nixpkgs/pkgs
Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
..
applications Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
build-support Automatically move stuff in lib64 to lib 2014-10-07 15:04:13 +02:00
data poppler_data: update from 0.4.6 to 0.4.7 2014-10-07 23:22:09 +02:00
desktops Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
development Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
games Add hedgewars 2014-10-14 16:40:56 +01:00
misc Replaced retroarchBare with retroarchBareMaster, also added a few new libretro cores 2014-10-16 12:53:39 +01:00
os-specific Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
servers Merge pull request #4495 from NixOS/pythonFull_improvements 2014-10-16 13:24:18 +02:00
shells Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
stdenv stdenv: Use "pipefail" in setup.sh 2014-10-10 14:02:15 +04:00
test Merge recent master into staging 2014-09-13 21:48:29 +02:00
tools Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00
top-level Merge remote-tracking branch 'origin/master' into staging 2014-10-16 15:16:50 +02:00