Vladimír Čunát 7af694700c Merge branch 'master' into x-updates ... Silently merged badly the firefox 20/21 things. I got that, hopefully there aren't more (my nixos-rebuild dry-run finds no more errors).		2013-06-05 12:59:47 +02:00
..
applications	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
build-support
data
desktops
development	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
games
lib	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
misc
os-specific	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
servers	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
shells
stdenv
test
tools	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
top-level	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00