Peter Simons 22fb1ad99e Merge remote-tracking branch 'origin/master' into stdenv-updates.		2013-03-21 09:23:54 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-21 09:23:54 +01:00
build-support	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
data	Adding the sgml dtd for docbook 3.1	2013-03-18 15:07:20 +01:00
desktops	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
development	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-21 09:23:54 +01:00
games	blobby: minor update, making it build	2013-03-17 21:14:33 +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
os-specific	Update Linux 3.9-rc to rc3	2013-03-19 13:34:57 +04:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells
stdenv	Merge remote-tracking branch 'origin/stdenv-updates' into illumos	2013-03-17 13:22:24 +01:00
test
tools	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-21 09:23:54 +01:00
top-level	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-21 09:23:54 +01:00