[Xfce4-commits] [xfce/xfce4-power-manager] 14/14: Merge branch 'ui-redesign'

[noreply at xfce.org]

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

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

commit 3a9bdb5dee57605882aa84d45f92158e31871256
Merge: 88682bb d739002
Author: Harald Judt <h.judt at gmx.at>
Date:   Sun Jul 27 13:02:06 2014 +0200

    Merge branch 'ui-redesign'

 data/interfaces/xfpm-settings.ui | 1677 ++++++++++++++++++++------------------
 settings/xfpm-settings.c         |  308 ++++---
 src/xfpm-config.h                |    3 +-
 src/xfpm-manager.c               |   25 +-
 src/xfpm-xfconf.c                |   32 +-
 5 files changed, 1143 insertions(+), 902 deletions(-)

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