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
..
gnu	GNU Hurd: Use preConfigure' to autoreconf' only.	2012-04-18 18:42:44 +00:00
linux	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
windows	Adding windows jom; it does not build for me still, but it's close to it.	2012-06-05 21:24:27 +00:00