[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.1.6-1-9-g65d368e

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit eb45a77334cc582961546576d39ecabf223e07e4
Merge: 31d83146c3b7d89ee5702ae1714b21f78b1d7a55 7b5b911a1b9d402caabf7fdb454f8d6e011aaea6
Author: Kai Wasserbäch <curan at debian.org>
Date:   Sat Jan 21 20:15:20 2012 +0100

    Merge commit 'upstream/1.2.0'
    
    Conflicts:
    	CMakeLists.txt

 .kdev4/oxygen-gtk.kdev4                            |   15 ----
 CMakeLists.txt                                     |   12 ++--
 demo/oxygenbuttondemowidget.cpp                    |    4 +
 demo/oxygeninputdemowidget.cpp                     |   27 ++++++--
 demo/oxygeninputdemowidget.h                       |   14 ++++
 rc/CMakeLists.txt                                  |    2 +-
 rc/argb-apps.conf                                  |    1 -
 special-icons/CMakeLists.txt                       |    2 +-
 src/CMakeLists.txt                                 |    1 +
 src/animations/oxygenanimations.cpp                |    8 +-
 src/animations/oxygenanimations.h                  |   19 +-----
 src/oxygenargbhelper.cpp                           |   31 +--------
 src/oxygenargbhelper.h                             |    7 --
 src/oxygenloghandler.cpp                           |   76 ++++++++++++++++++++
 .../oxygenhook.h => oxygenloghandler.h}            |   39 +++++------
 src/oxygenqtsettings.cpp                           |   42 ++++++++++-
 src/oxygenshadowhelper.cpp                         |   22 +++++-
 src/oxygenstyle.cpp                                |   51 +++++++++-----
 src/oxygenstyle.h                                  |   10 ++-
 src/oxygenstylehelper.cpp                          |   12 ++--
 src/oxygenstyleoptions.h                           |   24 ++++---
 src/oxygenstylewrapper.cpp                         |    6 ++
 src/oxygenwindowmanager.cpp                        |    3 +
 23 files changed, 276 insertions(+), 152 deletions(-)

-- 
gtk2-engines-oxygen packaging