Eelco Dolstra 6fb27abf33 Merge branch 'java'		2014-01-13 13:16:17 +01:00
..
applications	Merge branch 'java'	2014-01-13 13:16:17 +01:00
build-support	Merge branch 'java'	2014-01-13 13:16:17 +01:00
data
desktops	xfce: add xfce screenshooter	2014-01-13 10:55:18 +00:00
development	Merge branch 'java'	2014-01-13 13:16:17 +01:00
games
misc	wineStable: maintenance update 1.6.1 -> .2, use lcms2	2014-01-11 19:58:16 +01:00
os-specific	remove pointless passthru meta	2014-01-10 01:45:35 +01:00
servers	Merge branch 'java'	2014-01-13 13:16:17 +01:00
shells
stdenv	Remove non-kernel-specific klibc derivation	2014-01-05 07:38:58 -05:00
test
tools	Merge branch 'java'	2014-01-13 13:16:17 +01:00
top-level	Merge branch 'java'	2014-01-13 13:16:17 +01:00