Florian Friesdorf ddbd5c2eba Merge branch 'py/offline-distutils' into python-merge ... Conflicts: pkgs/development/python-modules/generic/default.nix		2012-11-23 17:28:51 +01:00
doc	Document that Java packages should install JARs in $out/lib/java	2012-11-08 16:31:08 +01:00
maintainers	svn path=/nixpkgs/trunk/; revision=32961	2012-03-09 17:53:04 +00:00
pkgs	Merge branch 'py/offline-distutils' into python-merge	2012-11-23 17:28:51 +01:00
.gitignore	Tell git to ignore .*.swp - Vim swap files	2012-10-04 11:27:57 +04:00
COPYING
default.nix
VERSION	* Bump version number.	2012-06-04 03:53:25 +00:00