[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.1.5-1-2-g4524e07

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 4524e07c0e7ff99c37fa7d4626caa973c640272f
Merge: 3941d70dcfb6cef36ae2b8bb2d89d10ef0bdef65 e9a1237eb88f6c89d885920e695d4bc1e4058547
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Dec 30 12:19:33 2011 +0200

    Merge commit 'upstream/1.1.6'

 .kdev4/oxygen-gtk.kdev4                       |   15 ++++++
 CMakeLists.txt                                |    2 +-
 demo/oxygendemodialog.cpp                     |    6 ++
 oxygen.diff                                   |   26 ---------
 rc/gtkrc                                      |    5 --
 src/animations/oxygenbackgroundhintengine.cpp |    2 +-
 src/animations/oxygeninnershadowdata.cpp      |    5 ++-
 src/oxygenapplicationname.cpp                 |    4 +-
 src/oxygenapplicationname.h                   |    2 -
 src/oxygengtkrc.cpp                           |   33 ++++++++++++
 src/oxygengtkrc.h                             |    5 ++
 src/oxygenqtsettings.cpp                      |   68 ++++++++++++++-----------
 src/oxygenshadowhelper.cpp                    |    3 +-
 src/oxygenstyle.cpp                           |   19 ++-----
 src/oxygenstylewrapper.cpp                    |   14 ++++--
 src/oxygentheme.cpp                           |   11 ++---
 16 files changed, 125 insertions(+), 95 deletions(-)

-- 
gtk2-engines-oxygen packaging