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
doc	Only show/build a package on the platforms listed in meta.platforms	2013-11-05 00:06:10 +01:00
lib	Simplify crossLists	2013-12-12 14:01:48 -05:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Merge master into x-updates	2013-12-18 23:21:29 +01:00
pkgs	Merge master into x-updates	2013-12-18 23:21:29 +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