Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +02:00
..
applications	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
build-support	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
data
desktops	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
development	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
games	haskell-Allure: add version 0.4.99.0	2014-08-12 12:37:44 +02:00
misc	Mednafen: update to 0.9.36.3	2014-08-14 11:20:25 -03:00
os-specific	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
servers	Add taskserver package (close #3269)	2014-08-15 00:28:41 +02:00
shells
stdenv	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
test
tools	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
top-level	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00