Moritz Ulrich f49becb7a6 Merge branch 'master' into dropbox-py ... Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de> Conflicts: pkgs/top-level/all-packages.nix		2013-04-04 00:18:48 +02:00
..
applications	Merge branch 'master' into dropbox-py	2013-04-04 00:18:48 +02:00
build-support	- fetchbzr and nix-prefetch-bzr now only export, instead of cloning	2013-03-31 19:16:18 -07:00
data	man-pages: Update to 3.50	2013-03-27 23:00:02 +01:00
desktops
development	Add various data-default instances.	2013-04-03 14:12:48 +02:00
games	anki: set platforms	2013-03-31 20:56:18 +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	Add the addPassthru library function	2013-03-24 08:29:10 -04:00
test
tools	Fix the path to ping	2013-04-03 23:34:02 +02:00
top-level	Merge branch 'master' into dropbox-py	2013-04-04 00:18:48 +02:00