[Xfce4-commits] [xfce/xfce4-power-manager] 05/06: Merge branch 'appdata'

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 9740ba3671374854c97fc6228fb7d98fb6a16a52
Merge: b8bd237 36af76a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Tue May 27 12:31:39 2014 +0200

    Merge branch 'appdata'

 configure.ac.in                                 |    1 +
 data/Makefile.am                                |    3 +-
 data/appdata/Makefile.am                        |   10 ++++
 data/appdata/xfce4-power-manager-default.png    |  Bin 0 -> 59568 bytes
 data/appdata/xfce4-power-manager.appdata.xml.in |   70 +++++++++++++++++++++++
 po/POTFILES.in                                  |    1 +
 6 files changed, 84 insertions(+), 1 deletion(-)

diff --cc configure.ac.in
index 0607ab4,a72e676..b852aa9
--- a/configure.ac.in
+++ b/configure.ac.in
@@@ -216,12 -215,24 +216,13 @@@ panel-plugins/brightness/Makefil
  data/Makefile
  data/icons/Makefile
  data/icons/16x16/Makefile
 -data/icons/16x16/actions/Makefile
 -data/icons/16x16/status/Makefile
  data/icons/22x22/Makefile
 -data/icons/22x22/actions/Makefile
 -data/icons/22x22/status/Makefile
  data/icons/24x24/Makefile
 -data/icons/24x24/actions/Makefile
 -data/icons/24x24/status/Makefile
 +data/icons/32x32/Makefile
  data/icons/48x48/Makefile
 -data/icons/48x48/actions/Makefile
 -data/icons/48x48/status/Makefile
 -data/icons/128x128/Makefile
 -data/icons/128x128/devices/Makefile
  data/icons/scalable/Makefile
 -data/icons/scalable/status/Makefile
 -data/icons/scalable/actions/Makefile
  data/interfaces/Makefile
+ data/appdata/Makefile
  po/Makefile.in
  ])
  AC_OUTPUT
diff --cc po/POTFILES.in
index 6ccb289,8487281..426a66e
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -20,5 -20,4 +20,6 @@@ src/xfce4-power-manager.desktop.i
  src/org.xfce.power.policy.in2
  panel-plugins/brightness/brightness-button.c
  panel-plugins/brightness/xfce4-brightness-plugin.desktop.in.in
 -data/appdata/xfce4-power-manager.appdata.xml.in
 +panel-plugins/battery/battery-button.c
 +panel-plugins/battery/xfce4-battery-plugin.desktop.in.in
++data/appdata/xfce4-power-manager.appdata.xml.in

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.