[Xfce4-commits] <xfwm4:master> Merge branch 'libxfce4ui' of ssh://git.xfce.org/git/xfce/xfwm4 into libxfce4ui

[Stephan Arts]

Updating branch refs/heads/master
         to f9068ec3519ecf1b077f8868a0d997373966d683 (commit)
       from c1a867e65bf68dda3be3d48edcb63d4305192f7e (commit)

commit f9068ec3519ecf1b077f8868a0d997373966d683
Merge: c1a867e65bf68dda3be3d48edcb63d4305192f7e cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Jan 10 10:22:34 2010 +0100

    Merge branch 'libxfce4ui' of ssh://git.xfce.org/git/xfce/xfwm4 into libxfce4ui
    
    Conflicts:
    	configure.ac.in

commit cebe5f8d6dce71dcb8ec7a7d7538081c3fd61ee7
Author: Stephan Arts <stephan at xfce.org>
Date:   Tue Aug 25 00:15:42 2009 +0200

    Initial commit for removing libxfcegui4 dependency