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
..
darwin-compilation.patch	glib: Fix compilation on Darwin and use default gcc	2014-07-15 11:09:30 +02:00
default.nix	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
setup-hook.sh	WIP: getting better	2014-08-30 19:11:52 +02:00
skip-timer-test.patch	glib-tested: skip broken timer test on i686	2014-08-27 17:37:26 +02:00