[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.0.4-1-6-g5f35913

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit 632c1d36f4d0d78c5ae9f661b38c59b35d894149
Merge: 4dbe93a8db190ac5b4115cd8d46ee0b0b6e165e6 998a7d99fb63d69474a03998778ad1aad39d59b3
Author: Kai Wasserbäch <curan at debian.org>
Date:   Fri May 20 10:12:06 2011 +0200

    Merge commit 'upstream/1.0.5'

 CMakeLists.txt                     |    2 +-
 config.h.cmake                     |    4 ++-
 src/animations/oxygenhoverdata.h   |    4 +-
 src/animations/oxygenhoverengine.h |   12 ++++++---
 src/oxygengtkutils.cpp             |   21 ++++++++++++++++
 src/oxygengtkutils.h               |   12 ++++++++-
 src/oxygenstyle.cpp                |    2 +
 src/oxygenstylehelper.cpp          |   46 ++++++++++++++++-------------------
 src/oxygenstylewrapper.cpp         |    8 +++---
 9 files changed, 73 insertions(+), 38 deletions(-)

-- 
gtk2-engines-oxygen packaging