diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /xmloff/dtd | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'xmloff/dtd')
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/Blocklist.dtd | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/chart.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/datastyl.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/defs.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/drawing.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/dtypes.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/form.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/meta.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/nmspace.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/office.dtd | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/office.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/openoffice-2.0-schema.rng | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/script.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/settings.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/style.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/table.mod | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | xmloff/dtd/text.mod | 0 |
17 files changed, 0 insertions, 0 deletions
diff --git a/xmloff/dtd/Blocklist.dtd b/xmloff/dtd/Blocklist.dtd index f7bb8eb321bb..f7bb8eb321bb 100644..100755 --- a/xmloff/dtd/Blocklist.dtd +++ b/xmloff/dtd/Blocklist.dtd diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod index e72bab68c3f9..e72bab68c3f9 100644..100755 --- a/xmloff/dtd/chart.mod +++ b/xmloff/dtd/chart.mod diff --git a/xmloff/dtd/datastyl.mod b/xmloff/dtd/datastyl.mod index daacfad66f5b..daacfad66f5b 100644..100755 --- a/xmloff/dtd/datastyl.mod +++ b/xmloff/dtd/datastyl.mod diff --git a/xmloff/dtd/defs.mod b/xmloff/dtd/defs.mod index 98c964fe99e3..98c964fe99e3 100644..100755 --- a/xmloff/dtd/defs.mod +++ b/xmloff/dtd/defs.mod diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod index 93d7544b4fb9..93d7544b4fb9 100644..100755 --- a/xmloff/dtd/drawing.mod +++ b/xmloff/dtd/drawing.mod diff --git a/xmloff/dtd/dtypes.mod b/xmloff/dtd/dtypes.mod index 4de538ced12b..4de538ced12b 100644..100755 --- a/xmloff/dtd/dtypes.mod +++ b/xmloff/dtd/dtypes.mod diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod index 511fb180f488..511fb180f488 100644..100755 --- a/xmloff/dtd/form.mod +++ b/xmloff/dtd/form.mod diff --git a/xmloff/dtd/meta.mod b/xmloff/dtd/meta.mod index 1ea845bcb02d..1ea845bcb02d 100644..100755 --- a/xmloff/dtd/meta.mod +++ b/xmloff/dtd/meta.mod diff --git a/xmloff/dtd/nmspace.mod b/xmloff/dtd/nmspace.mod index addcdc59224f..addcdc59224f 100644..100755 --- a/xmloff/dtd/nmspace.mod +++ b/xmloff/dtd/nmspace.mod diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd index c66bc8d2ad4b..c66bc8d2ad4b 100644..100755 --- a/xmloff/dtd/office.dtd +++ b/xmloff/dtd/office.dtd diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod index a7d50df0cf06..a7d50df0cf06 100644..100755 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod diff --git a/xmloff/dtd/openoffice-2.0-schema.rng b/xmloff/dtd/openoffice-2.0-schema.rng index 36a319876682..36a319876682 100644..100755 --- a/xmloff/dtd/openoffice-2.0-schema.rng +++ b/xmloff/dtd/openoffice-2.0-schema.rng diff --git a/xmloff/dtd/script.mod b/xmloff/dtd/script.mod index 5e255ac6df4d..5e255ac6df4d 100644..100755 --- a/xmloff/dtd/script.mod +++ b/xmloff/dtd/script.mod diff --git a/xmloff/dtd/settings.mod b/xmloff/dtd/settings.mod index bb9224237fa8..bb9224237fa8 100644..100755 --- a/xmloff/dtd/settings.mod +++ b/xmloff/dtd/settings.mod diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod index fef8f73630ef..fef8f73630ef 100644..100755 --- a/xmloff/dtd/style.mod +++ b/xmloff/dtd/style.mod diff --git a/xmloff/dtd/table.mod b/xmloff/dtd/table.mod index be30da54293c..be30da54293c 100644..100755 --- a/xmloff/dtd/table.mod +++ b/xmloff/dtd/table.mod diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod index 909321312df8..909321312df8 100644..100755 --- a/xmloff/dtd/text.mod +++ b/xmloff/dtd/text.mod |