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

1 files changed, 0 insertions, 23 deletions

diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst
index 4b00b6ed5b45..e69de29bb2d1 100644
--- a/wizards/prj/d.lst
+++ b/wizards/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\pck
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip
- ..\%__SRC%\bin\wzi*.res %_DEST%\bin\wzi*.res
-..\%__SRC%\bin\dbw*.res %_DEST%\bin\dbw*.res
-..\%__SRC%\bin\tpl*.res %_DEST%\bin\tpl*.res
-..\%__SRC%\bin\imp*.res %_DEST%\bin\imp*.res
-..\%__SRC%\bin\wwz*.res %_DEST%\bin\wwz*.res
-..\%__SRC%\bin\eur*.res %_DEST%\bin\eur*.res
-..\%__SRC%\bin\cal*.res %_DEST%\bin\cal*.res
-..\%__SRC%\bin\com*.res %_DEST%\bin\com*.res
-REM ..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\misc\agenda.component %_DEST%\xml\agenda.component
-..\%__SRC%\misc\fax.component %_DEST%\xml\fax.component
-..\%__SRC%\misc\form.component %_DEST%\xml\form.component
-..\%__SRC%\misc\letter.component %_DEST%\xml\letter.component
-..\%__SRC%\misc\query.component %_DEST%\xml\query.component
-..\%__SRC%\misc\report.component %_DEST%\xml\report.component
-..\%__SRC%\misc\table.component %_DEST%\xml\table.component
-..\%__SRC%\misc\web.component %_DEST%\xml\web.component