strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
302108 commits 9 branches 795 tags 2.1 GiB
Commit graph

32 commits

Author SHA1 Message Date
Jan Holesovsky
4be7cca60b 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
 2011-03-23 16:59:59 +01:00
Joachim Lingner
6d8590e60d jl64 #i117009# increase versions of cli assemblies 2011-02-18 12:42:54 +01:00
Thomas Arnhold
83734eea36 Clean up makefiles 2011-02-04 12:45:54 +01:00
Joachim Lingner
5bbd02f704 jl153 i111878 new versions for cli assemblies 2010-06-11 14:08:34 +02:00
sb
66597e7212 sb118: merged in re/DEV300_next towards DEV300_m76 2010-04-07 13:14:23 +02:00
Joachim Lingner
1a1c3d945c native0 #i161639# increase assembly versions 2010-03-10 15:39:04 +01:00
sb
2e24fc7415 sb118: merged in DEV300_m72 2010-02-25 12:46:45 +01:00
Jens-Heiner Rechtien
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
sb
11370224ce sb118: #i108269# first step of removing tcsh support 2010-01-12 18:49:59 +01:00
Oliver Bolte
b12afe9095 CWS-TOOLING: integrate CWS jl132 
2009-08-31 13:06:06 +0200 jl  r275601 : #i104650# increase versions of assemblies
2009-08-31 13:01:07 +0200 jl  r275598 : #i104650# increase versions of assemblies
2009-08-31 12:36:40 +0200 jl  r275597 : #i104650# new test library for 3.1.1 versions
2009-08-31 10:30:39 +0200 jl  r275586 : CWS-TOOLING: rebase CWS jl132 to trunk@275331 (milestone: DEV300:m56)
 2009-09-08 07:19:21 +00:00
Ivo Hinkelmann
31b05c84a5 CWS-TOOLING: integrate CWS jl126_DEV300 
2009-05-29 11:45:28 +0200 jl  r272444 : #i102355# new assembly versions
2009-05-29 11:14:35 +0200 jl  r272441 : #i102355# new assembly versions
2009-05-29 11:08:25 +0200 jl  r272439 : #i102355# test lib for 3.1 version
2009-05-29 08:43:22 +0200 jl  r272432 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310@272261 (milestone: OOO310:m12)
2009-04-30 21:12:02 +0200 jl  r271426 : CWS-TOOLING: rebase CWS jl126 to branches/OOO310@271208 (milestone: OOO310:m11)
 2009-06-12 19:50:49 +00:00
Oliver Bolte
ea6bc1e6af CWS-TOOLING: integrate CWS jl115 
2009-01-29 13:13:16 +0100 jsk  r267121 : #i98596#
2009-01-23 14:50:24 +0100 jl  r266821 : #98273# climaker.exe.config prevents using publisher policy
2009-01-23 14:10:51 +0100 jl  r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash
2009-01-19 11:36:29 +0100 jl  r266484 : #i96690# test extension
2009-01-19 11:32:46 +0100 jl  r266483 : #i96690#
2009-01-16 17:09:19 +0100 jl  r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors
2009-01-16 14:04:00 +0100 jl  r266416 : #i92032# increasing minimum version of Java
2009-01-16 10:57:02 +0100 jl  r266407 : #i96816# compiler warning breaks build
2009-01-15 16:58:54 +0100 jl  r266384 : #i94938# patch from cmc.
2009-01-15 16:35:18 +0100 jl  r266383 : #i95838# applying patch
2009-01-15 16:15:58 +0100 jl  r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented
2009-01-14 12:46:21 +0100 jl  r266287 : #i98038# increased assembly versions
2009-01-14 12:44:55 +0100 jl  r266285 : #i98038# increased assembly versions
2009-01-13 17:11:20 +0100 jl  r266239 : #i98038# new test library for assemblies from 3.0.1
 2009-02-12 11:44:09 +00:00
Jens-Heiner Rechtien
3b4c0c02bb CWS-TOOLING: integrate CWS jl114_DEV300 2008-11-20 10:05:43 +00:00
Kurt Zenker
0ea42ce14a INTEGRATION: CWS jl104 (1.11.2); FILE MERGED 
2008/06/18 15:29:22 jl 1.11.2.2: #i88078#  adapting cli_cppuhelper
2008/06/18 14:25:03 jl 1.11.2.1: #i88078#  cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
 2008-06-25 11:16:41 +00:00
Kurt Zenker
deec7491c2 INTEGRATION: CWS jl104 (1.3.4); FILE MERGED 
2008/06/18 14:25:03 jl 1.3.4.1: #i88078#  cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools
 2008-06-25 11:16:25 +00:00
Kurt Zenker
7c8c2ed0d5 INTEGRATION: CWS jl98_DEV300 (1.9.16); FILE MERGED 
2008/04/30 13:52:27 jl 1.9.16.2: #i88634# Increasing the version of the policy.1.0.cli_basetypes.dll to 10.0.0.0 caused the test programs to fail when updating an old office. It then  only worked with .NET Framework 2.0. However, a stand-alone installation worked properly with 1.1.
2008/04/24 08:59:06 jl 1.9.16.1: #i88634# increase versions of assemblies
 2008-05-21 07:24:28 +00:00
Rüdiger Timm
26b2081aaf INTEGRATION: CWS changefileheader (1.5.38); FILE MERGED 
2008/03/31 07:22:38 rt 1.5.38.1: #i87441# Change license header to LPGL v3.
 2008-04-11 10:56:57 +00:00
Rüdiger Timm
e77dd4197f INTEGRATION: CWS changefileheader (1.9.14); FILE MERGED 
2008/03/31 07:22:38 rt 1.9.14.1: #i87441# Change license header to LPGL v3.
 2008-04-11 10:56:41 +00:00
Rüdiger Timm
228232ac0e INTEGRATION: CWS changefileheader (1.2.80); FILE MERGED 
2008/03/31 07:22:38 rt 1.2.80.1: #i87441# Change license header to LPGL v3.
 2008-04-11 10:56:04 +00:00
Vladimir Glazounov
053c641bf6 INTEGRATION: CWS jl82 (1.8.4); FILE MERGED 
2007/11/26 14:05:40 jl 1.8.4.1: #i83970# new versions for assemblies
 2007-12-05 15:17:15 +00:00
Ivo Hinkelmann
f6b8885dbd INTEGRATION: CWS jl78_SRC680 (1.7.10); FILE MERGED 
2007/09/28 06:51:31 jl 1.7.10.1: #i82009# new versions
 2007-10-15 15:31:09 +00:00
Rüdiger Timm
815477c523 INTEGRATION: CWS jl69 (1.6.10); FILE MERGED 
2007/07/18 11:14:26 jl 1.6.10.1: #i79710# inkremented versions
 2007-07-24 08:17:16 +00:00
Ivo Hinkelmann
e28609dab1 INTEGRATION: CWS jl62_SRC680 (1.5.12); FILE MERGED 
2007/04/02 14:24:24 jl 1.5.12.1: #i75871# new versions for assemblies
 2007-04-16 12:40:53 +00:00
Oliver Bolte
721aaaf6e1 INTEGRATION: CWS ause069 (1.4.12); FILE MERGED 
2006/10/18 17:10:16 hjs 1.4.12.1: #i70359# remove forced shell calls
 2007-01-25 12:44:37 +00:00
Jens-Heiner Rechtien
0a19bcf8da INTEGRATION: CWS jl52 (1.4.4); FILE MERGED 
2006/12/15 13:49:31 jl 1.4.4.1: #72620# new versions
 2007-01-02 13:47:55 +00:00
Kurt Zenker
671adc0da8 INTEGRATION: CWS jsc14 (1.3.16); FILE MERGED 
2006/10/24 09:57:40 jl 1.3.16.1: #i69878# new versions for assemblies and policy files
 2006-11-06 14:08:54 +00:00
Ivo Hinkelmann
81f519dab6 INTEGRATION: CWS jl42 (1.3.2); FILE MERGED 
2006/07/31 10:29:59 jl 1.3.2.1: #i67891# cliureversion.mk must always be delivered
 2006-08-03 13:32:53 +00:00
Rüdiger Timm
cdf149ee48 INTEGRATION: CWS jl35 (1.2.12); FILE MERGED 
2006/07/18 10:49:24 jl 1.2.12.1: #i66953# increasing versions for OOo2.04
 2006-07-25 06:55:40 +00:00
Rüdiger Timm
4a3ee06577 INTEGRATION: CWS jl35 (1.2.12); FILE MERGED 
2006/07/18 09:52:11 jl 1.2.12.2: #67482# no automatic version increment
2006/05/19 12:52:40 jl 1.2.12.1: #64551# project did not build when L10N_framework variable was set
 2006-07-25 06:55:26 +00:00
Rüdiger Timm
a4cb0d9699 INTEGRATION: CWS jl31 (1.1.2); FILE ADDED 
2006/02/20 11:32:03 jl 1.1.2.1: #i62141# facilitate version changes
 2006-03-09 09:55:05 +00:00
Rüdiger Timm
2ae0e5dae8 INTEGRATION: CWS jl31 (1.1.2); FILE ADDED 
2006/02/20 13:40:05 jl 1.1.2.3: #62141 facilitate version changes
2006/02/20 11:40:10 jl 1.1.2.2: #i62141# facilitate version changes
2006/02/20 11:03:15 jl 1.1.2.1: #i62141# facilitate version changes
 2006-03-09 09:54:55 +00:00
Rüdiger Timm
2ad0847f78 INTEGRATION: CWS jl31 (1.1.2); FILE ADDED 
2006/02/20 11:11:23 jl 1.1.2.1: #i62141# facilitate version changes
 2006-03-09 09:54:44 +00:00