Tuomas Tynkkynen 8a460bf953 gcc 4.8, 4.9: Revert conflicting info output		2015-10-03 14:08:49 +02:00
..
applications	flac: Remove conflicting outputs produced by auto merge	2015-10-03 13:36:16 +02:00
build-support	stdenv/multiple-outputs: Fix checking of propagatedOutputs	2015-10-03 14:08:48 +02:00
data	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
desktops	Merge: staging with systemd	2015-10-02 10:24:41 +02:00
development	gcc 4.8, 4.9: Revert conflicting info output	2015-10-03 14:08:49 +02:00
games	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
misc	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
os-specific	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
servers	x11: Remove conflicting outputs produced by auto merge	2015-10-03 13:39:33 +02:00
shells	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
stdenv	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
test
tools	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00
top-level	Merge commit staging+systemd into closure-size	2015-10-03 13:33:37 +02:00