office-gobmx/setup_native/source
Xisco Fauli 6c76e4db03 Merge branch 'master' into feature/gsoc2011_wizards
Conflicts:
	automation/source/inc/cmdbasestream.hxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/retstrm.hxx
	automation/source/testtool/cmdstrm.cxx
	automation/source/testtool/cmdstrm.hxx
	automation/source/testtool/tcommuni.cxx
	basctl/prj/d.lst
	basctl/uiconfig/basicide/toolbar/findbar.xml
	cui/source/dialogs/about.cxx
	cui/source/dialogs/about.src
	cui/source/inc/about.hxx
	extensions/source/abpilot/abpservices.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/svg/makefile.mk
	forms/Library_frm.mk
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/prj/d.lst
	package/source/zipapi/XMemoryStream.cxx
	package/source/zipapi/XMemoryStream.hxx
	setup_native/prj/d.lst
	setup_native/source/win32/customactions/relnotes/makefile.mk
	tools/test/export.map
	wizards/com/sun/star/wizards/common/ConfigGroup.py
	wizards/com/sun/star/wizards/common/ConfigNode.py
	wizards/com/sun/star/wizards/common/Configuration.py
	wizards/com/sun/star/wizards/common/Desktop.py
	wizards/com/sun/star/wizards/common/FileAccess.py
	wizards/com/sun/star/wizards/common/Helper.py
	wizards/com/sun/star/wizards/common/SystemDialog.py
	wizards/com/sun/star/wizards/document/OfficeDocument.py
	wizards/com/sun/star/wizards/fax/FaxDocument.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
	wizards/com/sun/star/wizards/letter/LetterDocument.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
	wizards/com/sun/star/wizards/text/TextDocument.py
	wizards/com/sun/star/wizards/text/TextFieldHandler.py
	wizards/com/sun/star/wizards/text/TextSectionHandler.py
	wizards/com/sun/star/wizards/text/ViewHandler.py
	wizards/com/sun/star/wizards/ui/UnoDialog.py
	wizards/com/sun/star/wizards/ui/UnoDialog2.py
	wizards/com/sun/star/wizards/ui/WizardDialog.py
	wizards/com/sun/star/wizards/ui/event/CommonListener.py
	wizards/com/sun/star/wizards/ui/event/DataAware.py
	wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
	wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
	wizards/util/helpids.h
	wizards/util/hidother.src
	xmlsecurity/prj/build.lst
	xmlsecurity/prj/d.lst
	xmlsecurity/qa/certext/SanCertExt.cxx
2011-08-21 21:50:13 +02:00
..
java remove unused OOo brand image 2011-07-17 18:31:53 +02:00
linux
mac Merge branch 'master' into feature/gsoc2011_wizards 2011-08-21 21:50:13 +02:00
opensolaris/bundledextensions
packinfo Merge branch 'master' into feature/gsoc2011_wizards 2011-08-21 21:50:13 +02:00
ulfconv
win32 Merge branch 'master' into feature/gsoc2011_wizards 2011-08-21 21:50:13 +02:00