Peter Simons 9b302e1518 Merge branch 'master' into x-updates		2012-10-16 19:10:46 +02:00
..
applications	Merge branch 'master' into x-updates	2012-10-16 18:27:27 +02:00
build-support
data
desktops	Fix gvfs build	2012-10-15 12:13:39 -04:00
development	Merge branch 'master' into x-updates	2012-10-16 18:27:27 +02:00
games	- Make rili work with new autoconf versions	2012-10-05 13:56:51 -07:00
lib	Merge branch 'master' into zfs	2012-10-11 13:16:41 -07:00
misc	Merge branch 'master' into x-updates	2012-10-10 18:46:48 +02:00
os-specific	Work around timeouts after creating a LUKS device	2012-10-15 15:36:52 -04:00
servers	Fix font-cursor-misc build	2012-10-15 13:14:12 -04:00
shells	bash-completion: remove NixOS-specific patch	2012-10-16 18:26:02 +02:00
stdenv
test
tools	Merge branch 'master' into x-updates	2012-10-16 19:10:46 +02:00
top-level	Merge branch 'master' into x-updates	2012-10-16 18:27:27 +02:00