Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates. ... There was a minor conflict in 'stumpwm'. The package needs texinfo version 4.x. At least is used to, I'm not sure whether it still does.		2013-10-18 18:57:24 +02:00
..
generic	Merge branch 'origin/master' into stdenv-updates.	2013-10-18 18:57:24 +02:00
linux	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
mingw
native
nix
adapters.nix
common-path.nix
default.nix