Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
applications	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
build-support	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
data	man-pages: update to version 3.43	2012-11-05 11:42:05 +01:00
desktops	Add python-rsvg	2012-11-11 18:11:37 +01:00
development	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
games	TBE: fix unneeded /bin/sh reference	2012-11-10 15:14:28 +04:00
lib	Merge pull request #155 from bbenoist/newpkgs	2012-11-20 12:43:06 -08:00
misc	Wine: update, add auto-update helper	2012-11-10 14:43:17 +04:00
os-specific	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
servers	apache: merge updates from master branch	2012-11-21 16:09:08 +01:00
shells	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
stdenv	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
test
tools	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
top-level	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00