Peter Simons 62e37492b9 Merge remote-tracking branch 'origin/master' into stdenv-updates.		2013-04-04 00:51:30 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-04 00:51:30 +02:00
build-support	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-04 00:51:30 +02:00
data	man-pages: Update to 3.50	2013-03-27 23:00:02 +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-04-04 00:51:30 +02:00
games	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-01 13:39:57 +02:00
lib	Add myself (the-kenny) to the maintainer list.	2013-03-30 21:05:15 +01:00
misc	Add sha256 hash to winetricks.	2013-03-30 20:00:05 +01:00
os-specific	systemd: Update to 200	2013-03-31 16:16:07 +02:00
servers	Merge branch 'lighttpd' of git://github.com/bjornfor/nixpkgs into upstream-master	2013-04-01 13:06:03 -04:00
shells	ipython: modularize and enable more features	2013-03-27 15:39:03 +01:00
stdenv	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
test
tools	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-04 00:51:30 +02:00
top-level	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-04-04 00:51:30 +02:00