Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
12.nix	Merge pull request #1928 from 'cross-win-osx'.	2014-04-21 10:00:35 +02:00
15.nix	libpng12, libpng15: minor updates of legacy versions	2014-03-13 22:32:17 +01:00
default.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00