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
..
at-spi	at-spi-1.32.0	2012-03-08 22:45:02 +00:00
GConf	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
gconfmm	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
gnome-common	Update gnome-common	2011-10-08 19:12:24 +00:00
gnome-mime-data	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
gnome-vfs	gnome2.gnome_vfs: disable HAL, enable ACL	2012-01-07 15:31:31 +00:00
gnome-vfs-monikers	gnome-vfs-monikers: cleanup CPPFLAGS	2012-03-08 22:45:11 +00:00
gtkglext	gtkglext: fix by using pangox_compat	2013-02-02 14:39:21 +01:00
gtkglextmm	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
gtkhtml	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
libart_lgpl	gnome2.libart_lgpl: update	2013-02-21 21:51:09 +01:00
libbonobo	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libbonoboui	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libglade	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
libgnome	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libgnomecanvas	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libgnomecanvasmm	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
libgnomecups	Forgot to add some files	2012-10-09 17:07:59 -04:00
libgnomeprint	libgnomecups: Fix build	2012-10-09 11:23:56 -04:00
libgnomeprintui	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
libgnomeui	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libgtkhtml	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00
libIDL	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
libunique	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
ORBit2	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
startup-notification	gnome: use callPackage, move to gnome-2	2011-10-08 16:58:32 +00:00