Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
doc	Only show/build a package on the platforms listed in meta.platforms	2013-11-05 00:06:10 +01:00
lib	Merge master into x-updates	2013-12-02 21:41:16 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
pkgs	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +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