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
..
2.x.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
3.x.nix	Merge pull request #3275 from taku0/gtk-env	2014-08-29 01:35:38 +04:00