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
..
astronomy	stellarium: update to version 0.11.4a	2013-01-19 02:26:03 +01:00
biology	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
chemistry/avogadro	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
electronics	qucs: minor update and fix for new gcc	2013-02-24 15:11:19 +01:00
geometry	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
logic	TPTP had a bugfix without version change	2013-03-09 14:24:45 +04:00
math	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
misc	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
molecular-dynamics/gromacs	remove reference to meta.nix	2012-11-23 15:46:49 +01:00