Peter Simons d08a483bda haskell-ed25519 is broken		2015-08-25 17:15:41 +02:00
..
applications	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
build-support	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
data	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
desktops	gnome3: Depend on defaultIconTheme instead of hicolor- or adwaita	2015-08-25 14:23:10 +02:00
development	haskell-ed25519 is broken	2015-08-25 17:15:41 +02:00
games	micropolis: fix patch hash, probably updated	2015-08-24 08:23:44 +02:00
misc	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
os-specific	Merge branch 'staging'	2015-08-25 14:14:54 +02:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-08-20 10:32:29 -07:00
shells
stdenv	Merge branch 'master.upstream' into staging.upstream	2015-08-19 20:52:17 -07:00
test
tools	Make hydra build proxychains.	2015-08-25 14:28:12 +02:00
top-level	Merge branch 'staging'	2015-08-25 14:14:54 +02:00