Vladimír Čunát ac6761c908 Merge master into stdenv-updates ... Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix		2014-01-20 19:39:28 +01:00
doc	manual: Document Java support	2014-01-13 13:15:59 +01:00
lib	lib/maintainers.nix: add missing entry for 'sprock'	2014-01-20 18:18:35 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Whitespace to force a build	2014-01-19 15:07:35 -05:00
pkgs	Merge master into stdenv-updates	2014-01-20 19:39:28 +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