Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +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	remove .topmsg (close #1578)	2014-01-23 22:30:07 +01:00
pkgs	Merge master into x-updates	2014-01-23 22:52:18 +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