[Xfce4-commits] [apps/xfce4-screensaver] 30/425: Merge pull request #8 from NiceandGently/master

[noreply at xfce.org]

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

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit 2256a902e87b28697407c304bcb96ab1aeb3f669
Merge: ce7da34 8d80642
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Sat Nov 3 03:52:31 2012 -0700

    Merge pull request #8 from NiceandGently/master
    
    gsettings migration

 configure.ac                              |  16 +-
 data/Makefile.am                          |  34 +-
 data/org.mate.screensaver.gschema.migrate |  16 +
 data/org.mate.screensaver.gschema.xml.in  |  85 ++++
 po/POTFILES.in                            |   3 +-
 src/gs-lock-plug.c                        |  12 +-
 src/gs-manager.c                          | 122 +++---
 src/gs-prefs.c                            | 667 +++++++-----------------------
 src/mate-screensaver-preferences.c        | 340 +++++----------
 9 files changed, 433 insertions(+), 862 deletions(-)

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