diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:59 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:59 +0100 |
| commit | 4be7cca60bc7cc0a066b7384d56624266dc0dfcf (patch) | |
| tree | 990b1fda00fca6f26ff74fd29552687b4e3c37ed /unoil | |
| parent | 79a6c0f8a28b43c36c3b02dc5e116f2d17e92ef0 (diff) | |
| parent | a24842b43a687808376f69d4bdbb45fcddde73c4 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
codemaker/source/bonobowrappermaker/corbaoptions.cxx
codemaker/source/cppumaker/cppuoptions.cxx
codemaker/source/cunomaker/cunooptions.cxx
codemaker/source/idlmaker/idloptions.cxx
codemaker/source/javamaker/javaoptions.cxx
cppu/source/typelib/typelib.cxx
idlc/source/options.cxx
offapi/com/sun/star/util/PathSubstitution.idl
offapi/drafts/com/sun/star/form/ListEntryEvent.idl
offapi/drafts/com/sun/star/form/XBindableValue.idl
offapi/drafts/com/sun/star/form/XListEntryListener.idl
offapi/drafts/com/sun/star/form/XListEntrySink.idl
offapi/drafts/com/sun/star/form/XListEntrySource.idl
offapi/drafts/com/sun/star/form/XValueBinding.idl
registry/tools/checksingleton.cxx
registry/tools/options.hxx
registry/tools/regcompare.cxx
registry/tools/regmerge.cxx
sal/cppunittester/cppunittester.cxx
sal/osl/unx/socket.c
sal/osl/w32/diagnose.c
sal/prj/d.lst
sal/rtl/source/alloc_fini.cxx
sal/rtl/source/alloc_global.c
sal/rtl/source/makefile.mk
Diffstat (limited to 'unoil')
| -rwxr-xr-x[-rw-r--r--] | unoil/climaker/version.txt | 6 | ||||
| -rw-r--r-- | unoil/util/makefile.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt index 2678d1bc035b..f59c2f9482b4 100644..100755 --- a/unoil/climaker/version.txt +++ b/unoil/climaker/version.txt @@ -25,8 +25,8 @@ # #************************************************************************* -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_NEW_VERSION=1.0.8.0 +CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.7.0 +CLI_OOOTYPES_POLICY_VERSION=8.0.0.0 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes diff --git a/unoil/util/makefile.mk b/unoil/util/makefile.mk index f5d8125b81f8..c2bd22ef2733 100644 --- a/unoil/util/makefile.mk +++ b/unoil/util/makefile.mk @@ -35,7 +35,7 @@ TARGET = unoil MAXLINELENGTH = 100000 -JARCLASSDIRS = com drafts +JARCLASSDIRS = com JARTARGET = $(TARGET).jar JARCOMPRESS = TRUE |