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
data
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
test
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