Peter Simons 6ff829f19d Merge branch 'master' into x-updates		2012-10-10 18:46:48 +02:00
..
applications	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
build-support	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
data	xkeyboard-config; Update to 2.7	2012-09-26 15:51:57 -04:00
desktops	Forgot to add some files	2012-10-09 17:07:59 -04:00
development	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
games
lib	Add a function ‘getVersion’ to get the version of a derivation	2012-10-05 13:48:57 -04:00
misc	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
os-specific	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
servers	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
shells
stdenv
test
tools	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
top-level	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00