Peter Simons 486e7736df Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/networking/p2p/amule/default.nix		2013-12-10 00:25:54 +01:00
..
default.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-10 00:25:54 +01:00
gcc47.patch	amule: update and fix build on gcc47	2013-03-17 10:15:03 +01:00