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	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
data	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
desktops	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
development	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
games	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
lib	Merge branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
misc	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
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	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
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