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
..
apps	gtksourceview 3.12: hard code data dirs to nix store path	2014-07-13 16:32:41 +02:00
core	Merge recent master into staging	2014-08-21 15:09:31 +02:00
desktop/rarian
devtools	added meta information	2014-07-31 00:49:14 +02:00
misc	Merge recent master into staging	2014-08-30 10:04:02 +02:00
default.nix	gpaste: new package	2014-08-14 21:16:42 +02:00