[SCM] gtk2-engines-oxygen packaging branch, upstream, updated. upstream/1.1.5-3-g9c2c9c0

Fathi Boudra fabo at alioth.debian.org
Fri Dec 30 10:23:32 UTC 2011


The following commit has been merged in the upstream branch:
commit b7836c72f14f1941529828faf99fa0c076c09656
Merge: e9a1237eb88f6c89d885920e695d4bc1e4058547 f1798d6b47d8b96ce8efd8496ced7c98d00e16b4
Author: Fathi Boudra <fabo at debian.org>
Date:   Fri Dec 30 12:21:59 2011 +0200

    Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-kde/kde-extras/gtk2-engines-oxygen into upstream
    
    Conflicts:
    	CMakeLists.txt
    	demo/oxygendemodialog.cpp
    	src/animations/oxygenbackgroundhintengine.cpp
    	src/animations/oxygeninnershadowdata.cpp
    	src/oxygenapplicationname.cpp
    	src/oxygenapplicationname.h
    	src/oxygenstyle.cpp
    	src/oxygentheme.cpp

 oxygen.diff |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

-- 
gtk2-engines-oxygen packaging



More information about the pkg-kde-commits mailing list