Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (500 commits)
  masterfix DEV300: #i10000# remove hard dep
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix DEV300: #i100000# dep. fix
  masterfix DEV300: #i10000# removed one hard dep
  masterfix DEV300: #i10000# fixed patch handling
  masterfix DEV300: #i10000# new configure
  DEV300
  masterfix DEV300: #i10000# nawk -> awk
  l10nmove: adjust repository handling
  l10nmove: fixed regex
  l10nmove: minor fixes
  l10nmove: add l10n repo to gb_REPOS
  DEV300 masterfix: gnumake3: subsequenttests requires  in environment
  ab80: Adding changes of cws mib21, ab77, ab77run2, dr77i to dev300
  DEV300 masterfix: #i10000#: windows: more bizare hacks ...
  locales34: have a matching configure as well
  DEV300
  locales34: back out change from autoreconf
  gnumake3: JunitTest.mk: bizarre hacks to make it work on windows
  ...

Conflicts:
	configure
	configure.in
	instsetoo_native/prj/build.lst
	instsetoo_native/util/makefile.mk
	instsetoo_native/util/openoffice.lst
	instsetoo_native/util/pack.lst
	ooo.lst
	scp2/source/canvas/canvascommons.scp
	scp2/source/canvas/mtfrenderer.scp
	scp2/source/ooo/common_brand.scp
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_library_ooo.scp
	scp2/source/ooo/file_ooo.scp
	scp2/source/ooo/makefile.mk
	scp2/source/ooo/module_hidden_ooo.scp
	scp2/source/ooo/module_langpack.ulf
	scp2/source/ooo/ure.scp
	scp2/source/python/file_python.scp
	scp2/source/sdkoo/sdkoo.scp
	scp2/source/templates/module_langpack_accessories_templates.sct
	scp2/source/templates/module_langpack_accessories_templates_root.sct
	set_soenv.in
	soldep/bootstrp/appdef.cxx
	soldep/bootstrp/dep.cxx
	soldep/bootstrp/hashtbl.cxx
	soldep/bootstrp/makefile.mk
	soldep/bootstrp/minormk.cxx
	soldep/bootstrp/prj.cxx
	soldep/bootstrp/prodmap.cxx
	soldep/inc/dep.hxx
	soldep/inc/minormk.hxx
	soldep/inc/prodmap.hxx
	soldep/inc/soldep/appdef.hxx
	soldep/inc/soldep/connctr.hxx
	soldep/inc/soldep/depper.hxx
	soldep/inc/soldep/depwin.hxx
	soldep/inc/soldep/hashtbl.hxx
	soldep/inc/soldep/objwin.hxx
	soldep/inc/soldep/prj.hxx
	soldep/inc/soldep/sdtresid.hxx
	soldep/inc/soldep/soldep.hxx
	soldep/inc/soldep/soldlg.hxx
	soldep/inc/soldep/tbox.hxx
	soldep/prj/d.lst
	soldep/source/connctr.cxx
	soldep/source/depapp.hxx
	soldep/source/depper.cxx
	soldep/source/depwin.cxx
	soldep/source/makefile.mk
	soldep/source/objwin.cxx
	soldep/source/soldep.cxx
	soldep/source/soldlg.cxx
	soldep/source/soldlg.src
	soldep/source/tbox.cxx
	solenv/bin/build.pl
	solenv/bin/cws.pl
	solenv/bin/make_installer.pl
	solenv/bin/mhids.pl
	solenv/bin/modules/CwsConfig.pm
	solenv/bin/modules/RepositoryHelper.pm
	solenv/bin/modules/installer/regmerge.pm
	solenv/bin/modules/installer/scriptitems.pm
	solenv/bin/modules/installer/servicesfile.pm
	solenv/bin/modules/installer/simplepackage.pm
	solenv/bin/modules/installer/substfilenamefiles.pm
	solenv/config/ssolar.cmn
	solenv/inc/_tg_rslb.mk
	solenv/inc/extension_post.mk
	solenv/inc/libs.mk
	solenv/inc/minor.mk
	solenv/inc/postset.mk
	solenv/inc/settings.mk
	solenv/inc/tg_rslb.mk
	solenv/inc/unxlng.mk
	solenv/inc/wntmsc.mk
	soltools/HIDCompiler/hidclex.l
	stlport/prj/d.lst
	stlport/systemstlguards/postextstl.h

1 files changed, 199 insertions, 199 deletions

diff --git a/.gitignore b/.gitignore
index 4621c7b32..904eac38c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@
 /*/unxaig??
 /*/unxaig??.pro
 /solver/*
-/instsetoo_native/*
 
 # autoconf generated stuff
 /aclocal.m4
@@ -58,201 +57,202 @@
 /*/*.exe
 
 # links to the other repositories
-MathMLDTD
-Mesa
-UnoControls
-agg
-accessibility
-afms
-animations
-apache-commons
-apple_remote
-autodoc
-automation
-avmedia
-basctl
-basebmp
-basegfx
-basic
-bean
-beanshell
-berkeleydb
-binfilter
-boost
-bridges
-cairo
-canvas
-chart2
-cli_ure
-codemaker
-comphelper
-configmgr
-connectivity
-cosv
-cppcanvas
-cppu
-cppuhelper
-cppunit
-cpputools
-crashrep
-cui
-curl
-dbaccess
-default_images
-desktop
-dictionaries
-drawinglayer
-dtrans
-editeng
-embeddedobj
-embedserv
-epm
-eventattacher
-expat
-extensions
-external
-external_images
-extras
-fileaccess
-filter
-forms
-formula
-fpicker
-framework
-graphite
-helpcontent2
-hsqldb
-hunspell
-hwpfilter
-hyphen
-i18npool
-i18nutil
-icc
-icu
-idl
-idlc
-io
-javainstaller2
-javaunohelper
-jfreereport
-jpeg
-jurt
-jvmaccess
-jvmfwk
-l10n
-l10ntools
-languagetool
-libegg
-libtextcat
-libwpd
-libwpg
-libwps
-libxml2
-libxmlsec
-libxslt
-lingucomponent
-linguistic
-lotuswordpro
-lpsolve
-lucene
-mdds
-migrationanalysis
-more_fonts
-moz
-mysqlc
-mysqlcppconn
-mythes
-neon
-nlpsolver
-np_sdk
-nss
-o3tl
-odk
-offapi
-officecfg
-offuh
-ooo_custom_images
-oovbaapi
-oox
-openssl
-package
-packimages
-padmin
-postprocess
-psprint_config
-python
-pyuno
-qadevOOo
-rdbmaker
-readlicense_oo
-redland
-regexp
-registry
-remotebridges
-reportbuilder
-reportdesign
-rhino
-ridljar
-rsc
-sal
-salhelper
-sane
-sax
-saxon
-sc
-scaddins
-sccomp
-scripting
-sd
-sdext
-setup_native
-sfx2
-shell
-slideshow
-smoketestoo_native
-sot
-starmath
-stax
-stoc
-store
-svl
-svtools
-svx
-sw
-swext
-sysui
-test
-testautomation
-testgraphical
-testtools
-tomcat
-toolkit
-tools
-twain
-ucb
-ucbhelper
-udkapi
-udm
-unixODBC
-unodevtools
-unoil
-unotools
-unoxml
-ure
-uui
-vbahelper
-vcl
-vigra
-wizards
-writerfilter
-writerperfect
-x11_extensions
-xmerge
-xml2cmp
-xmlhelp
-xmloff
-xmlscript
-xmlsecurity
-xpdf
-xsltml
-zlib
+/MathMLDTD
+/Mesa
+/UnoControls
+/agg
+/accessibility
+/afms
+/animations
+/apache-commons
+/apple_remote
+/autodoc
+/automation
+/avmedia
+/basctl
+/basebmp
+/basegfx
+/basic
+/bean
+/beanshell
+/berkeleydb
+/binfilter
+/boost
+/bridges
+/cairo
+/canvas
+/chart2
+/cli_ure
+/codemaker
+/comphelper
+/configmgr
+/connectivity
+/cosv
+/cppcanvas
+/cppu
+/cppuhelper
+/cppunit
+/cpputools
+/crashrep
+/cui
+/curl
+/dbaccess
+/default_images
+/desktop
+/dictionaries
+/drawinglayer
+/dtrans
+/editeng
+/embeddedobj
+/embedserv
+/epm
+/eventattacher
+/expat
+/extensions
+/external
+/external_images
+/extras
+/fileaccess
+/filter
+/forms
+/formula
+/fpicker
+/framework
+/graphite
+/helpcontent2
+/hsqldb
+/hunspell
+/hwpfilter
+/hyphen
+/i18npool
+/i18nutil
+/icc
+/icu
+/idl
+/idlc
+/io
+/javainstaller2
+/javaunohelper
+/jfreereport
+/jpeg
+/jurt
+/jvmaccess
+/jvmfwk
+/l10n
+/l10ntools
+/languagetool
+/libegg
+/libtextcat
+/libwpd
+/libwpg
+/libwps
+/libxml2
+/libxmlsec
+/libxslt
+/lingucomponent
+/linguistic
+/lotuswordpro
+/lpsolve
+/lucene
+/mdds
+/migrationanalysis
+/more_fonts
+/moz
+/mysqlc
+/mysqlcppconn
+/mythes
+/neon
+/nlpsolver
+/np_sdk
+/nss
+/o3tl
+/odk
+/offapi
+/officecfg
+/offuh
+/ooo_custom_images
+/oovbaapi
+/oox
+/openssl
+/package
+/packimages
+/padmin
+/postprocess
+/psprint_config
+/python
+/pyuno
+/qadevOOo
+/rdbmaker
+/readlicense_oo
+/redland
+/regexp
+/registry
+/remotebridges
+/reportbuilder
+/reportdesign
+/rhino
+/ridljar
+/rsc
+/sal
+/salhelper
+/sane
+/sax
+/saxon
+/sc
+/scaddins
+/sccomp
+/scripting
+/sd
+/sdext
+/setup_native
+/sfx2
+/shell
+/slideshow
+/smoketestoo_native
+/sot
+/starmath
+/stax
+/stoc
+/store
+/svl
+/svtools
+/svx
+/sw
+/swext
+/sysui
+/test
+/testautomation
+/testgraphical
+/testtools
+/tomcat
+/toolkit
+/tools
+/twain
+/ucb
+/ucbhelper
+/udkapi
+/udm
+/unixODBC
+/unodevtools
+/unoil
+/unotools
+/unoxml
+/ure
+/uui
+/vbahelper
+/vcl
+/vigra
+/wizards
+/writerfilter
+/writerperfect
+/x11_extensions
+/xmerge
+/xml2cmp
+/xmlhelp
+/xmloff
+/xmlreader
+/xmlscript
+/xmlsecurity
+/xpdf
+/xsltml
+/zlib