Florian Friesdorf 06ca1e4768 Merge branch 'channel-nixos' into python		2013-01-09 22:18:38 +01:00
..
applications	firefox: adding 18.0	2013-01-09 17:31:04 +01:00
build-support
data
desktops
development	Merge branch 'channel-nixos' into python	2013-01-09 22:18:38 +01:00
games	bsd-games: fix some paths, pager and typo	2013-01-09 06:53:44 +01:00
lib
misc	Wine: Update to 1.5.21	2013-01-07 01:35:58 +04:00
os-specific	systemd: Remove some plymouth calls	2013-01-08 18:41:21 +01:00
servers	samba, imagemagick: Add missing meta info	2013-01-06 22:31:16 +01:00
shells
stdenv
test
tools	dd-agent: No need to propagate sysstat, dd-agent doesn't belong in user profiles anyway	2013-01-08 16:17:21 -05:00
top-level	Merge branch 'channel-nixos' into python	2013-01-09 22:18:38 +01:00