Thomas Tuegel 1fe28a1132 Merge remote-tracking branch 'upstream/master' into staging		2015-04-29 11:33:28 -05:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
build-support	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
data	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
desktops	remove plasma-5.2.2	2015-04-28 11:10:25 -05:00
development	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
games	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
misc	Fixed some descriptions	2015-04-28 10:55:20 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
shells	meta.licenses -> license	2015-04-21 23:10:07 +02:00
stdenv	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
test
tools	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2015-04-29 11:33:28 -05:00