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
..
4.13a.nix	Fix many package descriptions	2014-08-24 22:31:37 +02:00
5.2.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00