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

..

default.nix

…

gtk2.nix

…

src-for-default.nix

…

src-for-gtk2.nix

…

src-for-svn.nix

…

src-info-for-default.nix

…

src-info-for-svn.nix

…

svn.nix

…