Peter Simons ad242d38f0 Merge remote-tracking branch 'origin/master' into x-updates.		2013-01-28 17:26:32 +01:00
..
applications	RealPlayer: Remove	2013-01-28 16:31:23 +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	Merge branch 'master' into systemd	2013-01-15 12:11:07 +01:00
development	Merge remote-tracking branch 'origin/master' into x-updates.	2013-01-28 17:26:32 +01:00
games	use alsa-oss layer for minecraft	2013-01-28 02:58:47 +01:00
lib	chromium: Add myself to maintainers.	2013-01-10 03:33:04 +01:00
misc	uboot: updating the default uboot to 2012.07	2013-01-27 15:38:39 +01:00
os-specific	Linux 3.7.5	2013-01-28 00:12:35 -05:00
servers	Update zabbix2 to 2.0.4	2013-01-24 11:51:57 +01:00
shells
stdenv	lib.licenses.proprietary is definitely unfree	2013-01-27 18:36:54 -05:00
test
tools	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
top-level	RealPlayer: Remove	2013-01-28 16:31:23 +01:00