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	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
1.18.5.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
1.18.6.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
1.18.8.nix	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-05-22 12:30:02 +02:00
1.18.9.nix	Remove myself from the meta.maintainer field of most Haskell packages.	2013-05-11 00:36:59 +02:00
1.18.10.nix	Remove myself from the meta.maintainer field of most Haskell packages.	2013-05-11 00:36:59 +02:00
1.18.11.nix	happy: add version 1.18.11	2013-09-11 19:58:34 +02:00
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