Vladimír Čunát ac6761c908 Merge master into stdenv-updates ... Conflicts: pkgs/applications/version-management/gource/default.nix pkgs/top-level/all-packages.nix		2014-01-20 19:39:28 +01:00
..
1.18.4.nix
1.18.5.nix
1.18.6.nix
1.18.8.nix
1.18.9.nix
1.18.10.nix
1.18.11.nix
1.19.2.nix	happy-1.19.2: remove import of "Data.Monoid (<>)" from Setup.lhs to fix build with GHC 7.2.2	2014-01-11 12:03:41 +01:00
1.19.3.nix	happy: add version 1.19.3	2014-01-20 18:28:02 +01:00
adapt-crazy-perl-regex-for-cpp-4.8.0.patch