Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ...

Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix

2013-04-04 21:43:40 +02:00

..

2.6

for some reason the python2.6 manpage is not gzipped

2013-01-09 08:27:39 +01:00

2.7

python manpages as python2.6, python2.7 and python

2012-12-22 03:26:26 +01:00

3.3

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

docs

pythonDocs: recurseIntoAttrs does not recurse, bypass problem

2013-03-13 13:16:03 +01:00

python-linkme-wrapper.nix

python-linkme-wrapper

2013-01-22 15:28:30 +01:00

python-linkme-wrapper.sh

python: fix linkme-wrapper

2013-02-15 06:14:58 +01:00

wrapper.nix

fix pythonWrapper for non-gnu ln

2013-03-25 15:13:08 +01:00