Peter Simons c78d28fb72 Merge pull request #389 from aforemny/haskell-cereal-conduit ... Add haskell-cereal-conduit		2013-03-18 04:19:51 -07:00
..
applications	gv: update to version 3.7.4	2013-03-18 11:36:16 +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 pull request #389 from aforemny/haskell-cereal-conduit	2013-03-18 04:19:51 -07: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	Linux-3.9-rc2	2013-03-16 16:27:19 +04:00
servers	Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs	2013-03-08 18:19:02 -05:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Enable __ignoreNulls globally	2013-03-07 19:42:01 +01:00
test
tools	smartmontools: update to version 6.1 (using latest drivedb.h revision 3797 from trunk)	2013-03-18 12:17:26 +01:00
top-level	Merge pull request #389 from aforemny/haskell-cereal-conduit	2013-03-18 04:19:51 -07:00