Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/networking/p2p/amule/default.nix		2013-12-10 00:25:54 +01:00
doc	Only show/build a package on the platforms listed in meta.platforms	2013-11-05 00:06:10 +01:00
lib	gnome3.gnome-menus: fix file path, add maintainer	2013-12-07 14:04:50 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	nixos/libvirtd-service: fix fail-to-start when no machines are configured	2013-12-09 19:41:44 +01:00
pkgs	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-10 00:25:54 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Next release will be 14.02 Baboon	2013-11-01 09:16:36 +01:00
COPYING
default.nix