Florian Friesdorf ed4f0b2657 Merge branch 'channel-nixos' into python		2013-01-15 17:42:48 +01:00
..
applications	mplayer: Disable use of unfree binary codecs by default	2013-01-14 23:08:27 +01:00
build-support	source-tarball.nix: try src.revCount when src.rev is not available.	2013-01-15 15:04:38 +01:00
data	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
desktops	xfce4 terminal: fix url	2013-01-13 14:30:55 +01:00
development	Merge branch 'channel-nixos' into python	2013-01-15 17:42:48 +01:00
games	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
lib	chromium: Add myself to maintainers.	2013-01-10 03:33:04 +01:00
misc	Remove Wine-Warcraft because WarCraft 3 works just fine in vanilla Wine now.	2013-01-15 07:43:40 +02:00
os-specific	Fix bad URLs lacking a scheme	2013-01-14 18:26:46 +01:00
servers	Get rid of the "sf" alias for "sourceforge"	2013-01-14 12:00:32 +01:00
shells
stdenv
test
tools	torsocks: version bump to 1.2	2013-01-15 08:13:56 +02:00
top-level	Merge branch 'channel-nixos' into python	2013-01-15 17:42:48 +01:00