Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
config
hardware
installer
misc	memcached: set uid to make it work with #1076	2013-12-13 10:09:08 +01:00
profiles
programs
security
services	Merge master into x-updates	2013-12-18 23:21:29 +01:00
system	Fix passing of kernel parameters	2013-12-02 11:56:58 -05:00
tasks
testing
virtualisation	Google Compute image: fix punctuation in description, give disk image proper name with version and revision.	2013-12-12 12:48:09 +01:00
module-list.nix	nixos: add ntopng service	2013-12-09 21:35:01 +01:00
rename.nix