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
..
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
deterministic-build.patch
nix-store-mtime.patch
remove-avoid-daemon-thread-shutdown.patch	python27: Remove avoid daemon thread shutdown #i21963	2014-10-16 11:28:37 +02:00
search-path.patch
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00