[Libreoffice-commits] Changes to 'feature/gsoc2011_wizards'

[Libreoffice Gerrit user]

New branch 'feature/gsoc2011_wizards' available with the following commits:
commit 3eec17cb6ea20649d87f8e04dcffb4c75a75c12f
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Sep 23 00:29:10 2011 +0200

    Set the python fax wizard as the default one

commit 23518babd30b6ac5b103de8cc7e8d650c45f1e5e
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 22 14:28:25 2011 +0200

    Add the rest of the files to scp2

commit c4515272c6baed3f6aa4cc93bb7339da80fb66a6
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 22 13:47:43 2011 +0200

    add fax files to makefile

commit 70ab6f2194c50ebb5a55fc2bdac50dc78edbad0e
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 22 13:25:38 2011 +0200

    add directories to basic/program and makefiles

commit 4635566838195e3179e1d0c03c4dacf1d13c1d30
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 22 12:53:42 2011 +0200

    Forgotten file

commit 01fc75733c10918f9a6407cadaea476fc1a65610
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Thu Sep 22 11:36:19 2011 +0200

    Hello world (python) as a component

commit 7a9d9d73ada2458117327db467c2839cb4bfcad9
Merge: 119dd37ca560a578460009480bb7b2c78144370d 32967e26b54dcb584a84cbfed8ed9281690473d3
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Fri Sep 16 01:04:27 2011 +0200

    Merge branch 'master' into feature/gsoc2011_wizards
    
    Conflicts:
    	wizards/com/sun/star/wizards/fax/makefile.mk

commit 119dd37ca560a578460009480bb7b2c78144370d
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue Sep 6 17:41:17 2011 +0200

    remove java fax wizard

commit 9efca74e4eb076cbf496814a2b2140470205888c
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue Sep 6 17:10:33 2011 +0200

    Unused file

commit b55c26a346494f75e8f2ac968b4d08dedd4ab323
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Mon Sep 5 11:30:10 2011 +0200

    Fix merge conflicts