Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01: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.2	python3: fix libPrefix passthru	2013-02-16 18:10:43 +01:00
3.3	add python33 (needed by new blender)	2013-02-16 18:11:32 +01: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	recursivePthLoader included via wrapper, not propagated by modules	2013-01-11 09:53:28 +01:00