diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-07-16 15:45:18 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-07-16 15:45:18 +0200 |
| commit | 1588f8b510855be60cb6d62867446967faddeca5 (patch) | |
| tree | 35dff6abfbf896c56ccd8af07dcbd1c5c2931dac | |
| parent | 52782ca48f788bbe817ea12e35cc099687aca60e (diff) | |
| parent | e96a6bc06b47cb07a477478b9fcf6e91fc3e2df3 (diff) | |
jl154 merging with OOO300_m1
| -rw-r--r-- | cli_ure/version/version.txt | 26 | ||||
| -rw-r--r-- | offapi/type_reference/typelibrary_history.txt | 4 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 7307264 -> 7307264 bytes | |||
| -rw-r--r-- | sal/rtl/source/makefile.mk | 2 | ||||
| -rw-r--r-- | unoil/climaker/version.txt | 6 |
5 files changed, 21 insertions, 17 deletions
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt index 15dac78d4..8cbdedf65 100644 --- a/cli_ure/version/version.txt +++ b/cli_ure/version/version.txt @@ -25,23 +25,23 @@ # #************************************************************************* -CLI_URETYPES_NEW_VERSION=1.0.6.0 -CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.5.0 -CLI_URETYPES_POLICY_VERSION=6.0.0.0 +CLI_URETYPES_NEW_VERSION=1.0.7.0 +CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.6.0 +CLI_URETYPES_POLICY_VERSION=7.0.0.0 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes -CLI_BASETYPES_NEW_VERSION=1.0.17.0 -CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.16.0 -CLI_BASETYPES_POLICY_VERSION=17.0.0.0 +CLI_BASETYPES_NEW_VERSION=1.0.18.0 +CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.17.0 +CLI_BASETYPES_POLICY_VERSION=18.0.0.0 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes -CLI_URE_NEW_VERSION=1.0.20.0 -CLI_URE_OLD_VERSION=1.0.0.0-1.0.19.0 -CLI_URE_POLICY_VERSION=20.0.0.0 +CLI_URE_NEW_VERSION=1.0.21.0 +CLI_URE_OLD_VERSION=1.0.0.0-1.0.20.0 +CLI_URE_POLICY_VERSION=21.0.0.0 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure -CLI_CPPUHELPER_NEW_VERSION=1.0.20.0 -CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.19.0 -CLI_CPPUHELPER_POLICY_VERSION=20.0.0.0 +CLI_CPPUHELPER_NEW_VERSION=1.0.21.0 +CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.20.0 +CLI_CPPUHELPER_POLICY_VERSION=21.0.0.0 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper - + diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 086397e89..7dcd438d5 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -154,3 +154,7 @@ Update reference type library with the version of OOo 3.2. The new reference type library is taken from the release source tree OOO320 m12. +02/06/10 (JSC): TaskID=i112019 + Update reference type library with the version of OOo 3.2.1. The new + reference type library is taken from the release source tree OOO320 m19. + diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex 22b890405..6d9f76133 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk index 82b9394ee..9968d8992 100644 --- a/sal/rtl/source/makefile.mk +++ b/sal/rtl/source/makefile.mk @@ -46,7 +46,7 @@ TARGETTYPE=CUI .INCLUDE : settings.mk -.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" +.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" || "$(ALLOC)" == "JEMALLOC" CDEFS+= -DFORCE_SYSALLOC .ENDIF diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt index f3c80f838..2678d1bc0 100644 --- a/unoil/climaker/version.txt +++ b/unoil/climaker/version.txt @@ -25,8 +25,8 @@ # #************************************************************************* -CLI_OOOTYPES_NEW_VERSION=1.0.6.0 -CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.5.0 -CLI_OOOTYPES_POLICY_VERSION=6.0.0.0 +CLI_OOOTYPES_NEW_VERSION=1.0.7.0 +CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.6.0 +CLI_OOOTYPES_POLICY_VERSION=7.0.0.0 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes |