Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging ... ...in preparation for a merge to master		2014-07-22 22:28:39 +02:00
..
applications	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
build-support	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
data	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
desktops	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
development	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
games	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
misc	Don't use ensureDir	2014-07-22 11:01:32 +02:00
os-specific	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
servers	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
stdenv
test
tools	Don't use ensureDir	2014-07-22 11:01:32 +02:00
top-level	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00