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
..
applications	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
build-support	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
data	Add comic-neue font.	2014-08-28 13:05:45 +02:00
desktops	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
development	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
games	openspades: fix build by using fetchurl to download DevPaks27.zip.	2014-08-26 11:48:02 +02:00
misc	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
os-specific	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
servers	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
shells	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
stdenv	Revert "stdenv/setup.sh: unbreak *.lz sources on darwin"	2014-08-30 22:41:56 +02:00
test
tools	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00
top-level	Merge branch 'staging' into v/modular	2014-08-31 12:23:18 +02:00