Peter Simons 3e1de0f4e8 Merge branch 'master' into stdenv-updates.		2013-03-15 20:33:24 +01:00
..
applications	firefox: Update to 19.0.2	2013-03-15 14:31:25 +01:00
build-support	Debian VM image: Update to 6.0.7	2013-03-15 12:48:35 +01:00
data	man-pages: Update to 3.48	2013-03-08 19:49:53 -05:00
desktops	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
development	Merge branch 'master' into stdenv-updates.	2013-03-15 20:33:24 +01:00
games	vdrift: update and fix	2013-03-09 14:59:39 +01:00
lib	Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me	2013-03-08 22:59:54 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
os-specific	enable 802.11n by default.	2013-03-11 02:31:51 -07:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells
stdenv	Merge stdenv-updates-gcc47 into stdenv-updates	2013-03-09 12:01:39 +01:00
test
tools	checkinstall: Make installwatch.so work with old Glibcs	2013-03-15 14:04:32 +01:00
top-level	Merge branch 'master' into stdenv-updates.	2013-03-15 20:33:24 +01:00