Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
applications	Merge recent master into staging	2014-08-30 10:04:02 +02:00
build-support	Merge recent master into staging	2014-08-30 10:04:02 +02:00
data	Add comic-neue font.	2014-08-28 13:05:45 +02:00
desktops	Merge recent master into staging	2014-08-30 10:04:02 +02:00
development	Merge recent master into staging	2014-08-30 10:04:02 +02:00
games	openspades: fix build by using fetchurl to download DevPaks27.zip.	2014-08-26 11:48:02 +02:00
misc	ppsspp: update to 0.9.9.1	2014-08-25 10:14:44 +02:00
os-specific	Merge recent master into staging	2014-08-30 10:04:02 +02:00
servers	Merge recent master into staging	2014-08-30 10:04:02 +02:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv	Fix zlib handling in stdenvLinux	2014-08-26 17:17:13 +02:00
test
tools	Merge recent master into staging	2014-08-30 10:04:02 +02:00
top-level	Merge recent master into staging	2014-08-30 10:04:02 +02:00