Vladimír Čunát 86639d9bb9 Merge branch 'master' into x-updates ... Conflicts (taken master versions): pkgs/desktops/xfce-4.8/core/libxfcegui4.nix pkgs/desktops/xfce/applications/gigolo.nix pkgs/desktops/xfce/applications/mousepad.nix pkgs/desktops/xfce/applications/ristretto.nix pkgs/desktops/xfce/applications/terminal.nix pkgs/desktops/xfce/applications/xfce4-mixer.nix pkgs/desktops/xfce/applications/xfce4-notifyd.nix pkgs/desktops/xfce/applications/xfce4-taskmanager.nix pkgs/desktops/xfce/art/xfce4-icon-theme.nix pkgs/desktops/xfce/core/exo.nix pkgs/desktops/xfce/core/garcon.nix pkgs/desktops/xfce/core/gtk-xfce-engine.nix pkgs/desktops/xfce/core/libxfce4ui.nix pkgs/desktops/xfce/core/libxfce4util.nix pkgs/desktops/xfce/core/libxfcegui4.nix pkgs/desktops/xfce/core/thunar-volman.nix pkgs/desktops/xfce/core/thunar.nix pkgs/desktops/xfce/core/tumbler.nix pkgs/desktops/xfce/core/xfce4-appfinder.nix pkgs/desktops/xfce/core/xfce4-panel.nix pkgs/desktops/xfce/core/xfce4-power-manager.nix pkgs/desktops/xfce/core/xfce4-session.nix pkgs/desktops/xfce/core/xfce4-settings.nix pkgs/desktops/xfce/core/xfconf.nix pkgs/desktops/xfce/core/xfdesktop.nix pkgs/desktops/xfce/core/xfwm4.nix pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix pkgs/development/libraries/webkit/default.nix pkgs/top-level/all-packages.nix		2013-03-09 17:55:37 +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: group in subfolders pythonXY/TYPE	2013-03-05 12:41:30 +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