Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates ... Conflicts: pkgs/misc/maven/maven-1.0.nix pkgs/os-specific/linux/xf86-input-wacom/default.nix		2012-09-26 14:51:51 -04:00
doc	Remove all svn references	2012-09-04 16:14:01 +02:00
maintainers	svn path=/nixpkgs/trunk/; revision=32961	2012-03-09 17:53:04 +00:00
pkgs	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
.gitignore	add `.gitignore'	2012-07-07 13:56:29 +02:00
COPYING
default.nix
VERSION	* Bump version number.	2012-06-04 03:53:25 +00:00