[Xfce4-commits] <xfce4-mm:master> Merge branch 'master' of ssh://git.xfce.org/git/bindings/xfce4-mm

[Jens Luedicke]

Updating branch refs/heads/master
         to 3551cb7230a0d87b1b448a544ccc5c5a3477e9ba (commit)
       from 8347cdbe6dca8aceb3185678acfc3bde01c5a176 (commit)

commit 3551cb7230a0d87b1b448a544ccc5c5a3477e9ba
Merge: 8347cdb 4e320fe
Author: Jens Luedicke <perldude at xfce.org>
Date:   Mon Jan 17 01:15:18 2011 +0100

    Merge branch 'master' of ssh://git.xfce.org/git/bindings/xfce4-mm
    
    Conflicts:
    	CMakeLists.txt
    	libxfce4ui-mm/dialogs.h
    	libxfce4ui-mm/gdk-extensions.h
    	libxfce4ui-mm/gtk-extensions.cpp
    	libxfce4ui-mm/gtk-extensions.h
    	libxfce4ui-mm/titled-dialog.h
    	libxfce4util-mm/CMakeLists.txt

commit 4e320fe99c6a8585bb30a44d0c365cb616715b96
Merge: d301ac4 79e4265
Author: Jens Luedicke <jens at linux-vq8x.site>
Date:   Sun Jan 16 20:01:02 2011 +0100

    Merge branch 'local'

commit 79e4265fb0fac06da49ef1789c19af71c783752a
Author: Jens Luedicke <jens at linux-vq8x.site>
Date:   Sun Jan 16 19:51:21 2011 +0100

    Removed bindings for deprecated libxfcegui4 library.

commit 2baad3fa699a5c15a2824a85d3d8f1d5195c1cf6
Author: Jens Luedicke <jens at linux-vq8x.site>
Date:   Sun Jan 16 19:50:33 2011 +0100

    Changed to CMake build system.