Vladimír Čunát 2990145170 remerge to retrieve refactoring lost 10 days ago ... In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix were not merged correctly. Conflicts: pkgs/stdenv/generic/default.nix		2014-08-31 13:09:15 +02:00
..
applications	TMP	2014-08-31 13:00:19 +02:00
build-support	TMP	2014-08-31 13:00:19 +02:00
data	Add comic-neue font.	2014-08-28 13:05:45 +02:00
desktops	TMP	2014-08-31 13:00:19 +02:00
development	TMP	2014-08-31 13:00:19 +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	TMP	2014-08-31 13:00:19 +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	remerge to retrieve refactoring lost 10 days ago	2014-08-31 13:09:15 +02:00
test
tools	TMP	2014-08-31 13:00:19 +02:00
top-level	TMP	2014-08-31 13:00:19 +02:00