Vladimír Čunát 7943a3c648 fix bad merge		2013-02-02 21:22:11 +01:00
..
applications	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
build-support
data
desktops	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
development	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
games
lib
misc	Merge branch 'master' into x-updates	2013-02-02 21:11:00 +01:00
os-specific
servers
shells
stdenv
test
tools
top-level	fix bad merge	2013-02-02 21:22:11 +01:00