Commit graph

3242 commits

Author SHA1 Message Date
Rüdiger Timm
4b3aee8982 INTEGRATION: CWS rmfreetype (1.136.34); FILE MERGED
2008/07/28 11:02:23 obr 1.136.34.1: #i52025#,#i52026# system freetype no longer optional
2008-08-01 13:36:09 +00:00
Rüdiger Timm
e334be1037 DEV300 2008-07-30 14:05:24 +00:00
Rüdiger Timm
bc462f4632 INTEGRATION: CWS ause091 (1.236.6); FILE MERGED
2008/07/25 15:29:25 hjs 1.236.6.3: #i92050# - create *minor.mk in a mp safe way - no output tree in solenv!
2008/07/25 11:26:36 hjs 1.236.6.2: #i92130# normalize output filename before passing it over to xsltproc
2008/07/24 17:14:28 hjs 1.236.6.1: #i92050# - create *minor.mk in a mp safe way - no output tree in solenv!
2008-07-30 11:55:12 +00:00
Rüdiger Timm
6027f452ba INTEGRATION: CWS ause091 (1.11.4); FILE MERGED
2008/07/23 14:23:08 hjs 1.11.4.1: #i92044# - do not relay on intermediate files
2008-07-30 11:48:35 +00:00
Rüdiger Timm
f82e8cea88 INTEGRATION: CWS ause091 (1.21.4); FILE MERGED
2008/07/25 11:26:36 hjs 1.21.4.1: #i92130# normalize output filename before passing it over to xsltproc
2008-07-30 11:48:21 +00:00
Rüdiger Timm
c8ff384377 INTEGRATION: CWS ause091 (1.209.10); FILE MERGED
2008/07/24 17:17:20 hjs 1.209.10.1: #i91841 - move wntmsci10 debug process limiting to settings.mk
2008-07-30 11:48:06 +00:00
Rüdiger Timm
bb8304c176 INTEGRATION: CWS ause091 (1.101.14); FILE MERGED
2008/07/28 16:13:59 hjs 1.101.14.2: #i92204# - different tmp dirs for pro and nonpro
2008/07/23 14:23:08 hjs 1.101.14.1: #i92044# - do not relay on intermediate files
2008-07-30 11:47:36 +00:00
Oliver Bolte
cee47d2751 DEV300 2008-07-26 05:40:44 +00:00
Oliver Bolte
07553af076 INTEGRATION: CWS localisation29 (1.46.84); FILE MERGED
2008/07/14 16:50:25 vg 1.46.84.2: #i52975#,#i87989#,#i87994#,#i85486#,#i81177#,#i56024#,#i85700#,#i90333#,#i87976#,#i91388#,#i91317#,#i61734#,#i87984#,#i80503#,#i89100#,#i87993#,#i87982#,#i91030#,#i91228#,#i76701#,#i90330#,#i85699#,#i87995#,#i88000#,#i81671#,#i79805#,#i85655#,#i87980#,#i77223#,#i91096#,#i91176#,#i87990#,#i87973#,#i89705#,#i85704#,#i90375#,#i91095#,#i91219#,#i64726#,#i85145#,#i90303#,#i91363#,#i82089#,#i90331#,#i87983#,#i87986#,#i85695#,#i85651#,#i83821#,#i81419#,#i90327#,#158183#,#i91418#,#i80812#,#i85703#,#i91302#,#i91221#,#i76172#,#i87988#,#i87760#,#i91085#,#i87981#,#i85694#,#i84900#,#i91381#,#i89617#,#i80523#,#i62571#,#i85652#,#i62701#,#i91257#,#i91040#,#i91029#,#i91256#,#i91222#,#i91356#,#i91261#,#i87997#,#i88441#,#i91341#,#i87203#,#i89014#,#i87996#,#i85653#,#i88444#,#i91354#,#i91413#,#i90223#,#i82093# localisation for OOo 3.0 final
2008/07/14 10:57:16 vg 1.46.84.1: #i52975#,#i87989#,#i87994#,#i85486#,#i81177#,#i56024#,#i85700#,#i90333#,#i87976#,#i91388#,#i91317#,#i61734#,#i87984#,#i80503#,#i89100#,#i87993#,#i87982#,#i91030#,#i91228#,#i76701#,#i90330#,#i85699#,#i87995#,#i88000#,#i81671#,#i79805#,#i85655#,#i87980#,#i77223#,#i91096#,#i91176#,#i87990#,#i87973#,#i89705#,#i85704#,#i90375#,#i91095#,#i91219#,#i64726#,#i85145#,#i90303#,#i91363#,#i82089#,#i90331#,#i87983#,#i87986#,#i85695#,#i85651#,#i83821#,#i81419#,#i90327#,#158183#,#i91418#,#i80812#,#i85703#,#i91302#,#i91221#,#i76172#,#i87988#,#i87760#,#i91085#,#i87981#,#i85694#,#i84900#,#i91381#,#i89617#,#i80523#,#i62571#,#i85652#,#i62701#,#i91257#,#i91040#,#i91029#,#i91256#,#i91222#,#i91356#,#i91261#,#i87997#,#i88441#,#i91341#,#i87203#,#i89014#,#i87996#,#i85653#,#i88444#,#i91354#,#i91413#,#i90223#,#i82093# localisation for OOo 3.0 final
2008-07-25 17:48:15 +00:00
Oliver Bolte
a960193e7c INTEGRATION: CWS cmcfixes46 (1.133.28); FILE MERGED
2008/07/14 08:29:56 cmc 1.133.28.2: RESYNC: (1.133-1.136); FILE MERGED
2008/06/03 09:26:48 cmc 1.133.28.1: #i83545# lets try this fix
2008-07-25 10:12:43 +00:00
Oliver Bolte
5b7e1121ee DEV300 2008-07-22 18:04:15 +00:00
Oliver Bolte
e49c312cb0 INTEGRATION: CWS os2port03 (1.1.2); FILE ADDED
2008/01/15 08:49:56 ydario 1.1.2.1: os2 startup macros.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:34 +00:00
Oliver Bolte
9b4c9a44af INTEGRATION: CWS os2port03 (1.54.62); FILE MERGED
2008/07/16 12:20:19 obr 1.54.62.3: RESYNC: (1.55-1.57); FILE MERGED
2008/01/15 13:52:27 obr 1.54.62.2: RESYNC: (1.54-1.55); FILE MERGED
2008/01/15 09:36:36 ydario 1.54.62.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:23 +00:00
Oliver Bolte
11cab37e55 INTEGRATION: CWS os2port03 (1.36.46); FILE MERGED
2008/07/16 12:20:16 obr 1.36.46.4: RESYNC: (1.37-1.41); FILE MERGED
2008/04/15 14:38:00 ydario 1.36.46.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:24 obr 1.36.46.2: RESYNC: (1.36-1.37); FILE MERGED
2008/01/15 09:36:36 ydario 1.36.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:52:10 +00:00
Oliver Bolte
2b2eb9efe3 INTEGRATION: CWS os2port03 (1.13.334); FILE MERGED
2008/07/16 12:20:12 obr 1.13.334.2: RESYNC: (1.13-1.14); FILE MERGED
2008/01/15 09:36:36 ydario 1.13.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:57 +00:00
Oliver Bolte
a166edea5f INTEGRATION: CWS os2port03 (1.115.10); FILE MERGED
2008/07/16 12:20:09 obr 1.115.10.5: RESYNC: (1.118-1.126); FILE MERGED
2008/04/15 14:38:00 ydario 1.115.10.4: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/16 07:35:30 ydario 1.115.10.3: Remove empty line (added by mistake) in WNT build.
Issue number:i85203
Submitted by:ydario
2008/01/15 13:52:21 obr 1.115.10.2: RESYNC: (1.115-1.118); FILE MERGED
2008/01/15 09:36:36 ydario 1.115.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:45 +00:00
Oliver Bolte
2e639c4b68 INTEGRATION: CWS os2port03 (1.14.334); FILE MERGED
2008/07/16 12:20:06 obr 1.14.334.2: RESYNC: (1.14-1.15); FILE MERGED
2008/01/15 09:36:36 ydario 1.14.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:31 +00:00
Oliver Bolte
f3aed6d944 INTEGRATION: CWS os2port03 (1.22.334); FILE MERGED
2008/07/16 12:20:03 obr 1.22.334.2: RESYNC: (1.22-1.23); FILE MERGED
2008/01/15 09:36:36 ydario 1.22.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:17 +00:00
Oliver Bolte
646d086974 INTEGRATION: CWS os2port03 (1.43.6); FILE MERGED
2008/07/16 12:20:00 obr 1.43.6.4: RESYNC: (1.44-1.48); FILE MERGED
2008/04/15 14:38:00 ydario 1.43.6.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:18 obr 1.43.6.2: RESYNC: (1.43-1.44); FILE MERGED
2008/01/15 09:36:36 ydario 1.43.6.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:51:04 +00:00
Oliver Bolte
6af0deee9a INTEGRATION: CWS os2port03 (1.68.10); FILE MERGED
2008/07/16 12:19:56 obr 1.68.10.3: RESYNC: (1.69-1.74); FILE MERGED
2008/01/15 13:52:15 obr 1.68.10.2: RESYNC: (1.68-1.69); FILE MERGED
2008/01/15 09:36:36 ydario 1.68.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:51 +00:00
Oliver Bolte
2d5aef0dd6 INTEGRATION: CWS os2port03 (1.201.46); FILE MERGED
2008/07/16 12:19:53 obr 1.201.46.3: RESYNC: (1.202-1.209); FILE MERGED
2008/01/15 13:52:12 obr 1.201.46.2: RESYNC: (1.201-1.202); FILE MERGED
2008/01/15 09:36:36 ydario 1.201.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:38 +00:00
Oliver Bolte
cca46caf65 INTEGRATION: CWS os2port03 (1.10.218); FILE MERGED
2008/07/16 12:19:50 obr 1.10.218.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/15 09:36:36 ydario 1.10.218.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:25 +00:00
Oliver Bolte
d4b78cfea9 INTEGRATION: CWS os2port03 (1.220.8); FILE MERGED
2008/07/16 12:19:47 obr 1.220.8.4: RESYNC: (1.224.2.1-1.233); FILE MERGED
2008/02/08 08:15:58 obr 1.220.8.3: RESYNC: (1.224-1.224.2.1); FILE MERGED
2008/01/15 13:52:09 obr 1.220.8.2: RESYNC: (1.220-1.224); FILE MERGED
2008/01/15 09:36:36 ydario 1.220.8.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:12 +00:00
Oliver Bolte
3cece8e0af INTEGRATION: CWS os2port03 (1.91.60.1.4); FILE MERGED
2008/07/16 12:19:44 obr 1.91.60.1.4.2: RESYNC: (1.91.60.1-1.99); FILE MERGED
2008/01/29 15:36:12 ydario 1.91.60.1.4.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:50:00 +00:00
Oliver Bolte
5bdf81d461 INTEGRATION: CWS os2port03 (1.48.218); FILE MERGED
2008/07/16 12:19:41 obr 1.48.218.2: RESYNC: (1.48-1.49); FILE MERGED
2008/04/15 14:38:00 ydario 1.48.218.1: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008-07-22 15:49:47 +00:00
Oliver Bolte
c08f526967 INTEGRATION: CWS os2port03 (1.5.2); FILE ADDED
2008/07/18 11:27:40 rt 1.5.2.3: License header updated.
2008/04/15 14:38:00 ydario 1.5.2.2: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2003/08/25 14:46:01 ydario 1.5.2.1: file os2.mk was added on branch cws_src680_os2port03 on 2008-04-15 14:38:00 +0000
2008-07-22 15:49:32 +00:00
Oliver Bolte
e75ddc4836 INTEGRATION: CWS os2port03 (1.123.44); FILE MERGED
2008/07/16 12:19:38 obr 1.123.44.3: RESYNC: (1.123-1.136); FILE MERGED
2008/04/15 14:37:59 ydario 1.123.44.2: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/29 15:36:12 ydario 1.123.44.1: os2 build system fixes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:49:20 +00:00
Oliver Bolte
6e257fbe9a INTEGRATION: CWS os2port03 (1.33.46); FILE MERGED
2008/07/16 12:19:34 obr 1.33.46.4: RESYNC: (1.34-1.36); FILE MERGED
2008/04/15 14:37:59 ydario 1.33.46.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:52:06 obr 1.33.46.2: RESYNC: (1.33-1.34); FILE MERGED
2008/01/15 09:36:37 ydario 1.33.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:49:02 +00:00
Oliver Bolte
15c055ddf7 INTEGRATION: CWS os2port03 (1.111.16); FILE MERGED
2008/07/16 12:19:31 obr 1.111.16.5: RESYNC: (1.114-1.122); FILE MERGED
2008/04/15 14:37:59 ydario 1.111.16.4: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/16 07:35:30 ydario 1.111.16.3: Remove empty line (added by mistake) in WNT build.
Issue number:i85203
Submitted by:ydario
2008/01/15 13:52:02 obr 1.111.16.2: RESYNC: (1.111-1.114); FILE MERGED
2008/01/15 09:36:37 ydario 1.111.16.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:48:40 +00:00
Oliver Bolte
e6ab684abd INTEGRATION: CWS os2port03 (1.19.334); FILE MERGED
2008/01/15 09:36:37 ydario 1.19.334.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:48:00 +00:00
Oliver Bolte
70b5b6e996 INTEGRATION: CWS os2port03 (1.42.6); FILE MERGED
2008/07/16 12:19:26 obr 1.42.6.4: RESYNC: (1.43-1.46); FILE MERGED
2008/04/15 14:37:58 ydario 1.42.6.3: Issue number:  i85203
Submitted by: ydario
Reviewed by: ydario
2008/01/15 13:51:59 obr 1.42.6.2: RESYNC: (1.42-1.43); FILE MERGED
2008/01/15 09:36:37 ydario 1.42.6.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:47:41 +00:00
Oliver Bolte
863160c878 INTEGRATION: CWS os2port03 (1.63.10); FILE MERGED
2008/07/16 12:19:22 obr 1.63.10.3: RESYNC: (1.64-1.68); FILE MERGED
2008/01/15 13:51:56 obr 1.63.10.2: RESYNC: (1.63-1.64); FILE MERGED
2008/01/15 09:36:37 ydario 1.63.10.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario
2008-07-22 15:47:26 +00:00
Vladimir Glazounov
e8ff9bc14f DEV300 2008-07-17 17:25:17 +00:00
Vladimir Glazounov
6393156469 DEV300 2008-07-17 17:00:15 +00:00
Vladimir Glazounov
4975bf7e52 DEV300 2008-07-17 16:57:28 +00:00
Vladimir Glazounov
f0cd1c4ce3 DEV300 2008-07-17 16:53:39 +00:00
Ivo Hinkelmann
c71338a81d DEV300 2008-07-17 16:50:04 +00:00
Ivo Hinkelmann
db707fb030 INTEGRATION: CWS ause095 (1.88.42); FILE MERGED
2008/07/17 12:35:24 hjs 1.88.42.4: #i90789# - minor cleanup
2008/07/07 10:18:27 hjs 1.88.42.3: RESYNC: (1.88-1.89); FILE MERGED
2008/06/25 11:46:38 hjs 1.88.42.2: #i85054# - no backup of patched files
2008/06/25 09:49:17 hjs 1.88.42.1: #i90789# - consistently address patches when applying or creating
2008-07-17 12:38:15 +00:00
Ivo Hinkelmann
78ee5f1428 INTEGRATION: CWS ause095 (1.233.32); FILE MERGED
2008/07/09 12:03:04 hjs 1.233.32.2: #i90789# - special handling for cygwin .WINPATH mode
2008/06/25 09:49:17 hjs 1.233.32.1: #i90789# - consistently address patches when applying or creating
2008-07-17 12:37:59 +00:00
Hans-Joachim Lankenau
f1ba0fc950 #i10000# - avoid collisions for NETWORK_BUILD 2008-07-14 11:30:37 +00:00
Rüdiger Timm
dc03bd5366 DEV300 2008-07-11 18:58:04 +00:00
Rüdiger Timm
84953a4a07 INTEGRATION: CWS jsc21 (1.48.30); FILE MERGED
2008/07/04 11:34:25 jsc 1.48.30.5: RESYNC: (1.50-1.52); FILE MERGED
2008/06/11 14:44:59 sb 1.48.30.4: RESYNC: (1.49-1.50); FILE MERGED
2008/04/23 09:50:48 jsc 1.48.30.3: RESYNC: (1.48-1.49); FILE MERGED
2008/04/11 12:37:15 jsc 1.48.30.2: #i86121# new rpath option for SDK related tools
2008/04/11 12:20:17 jsc 1.48.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:45:53 +00:00
Rüdiger Timm
0adc82eb75 INTEGRATION: CWS jsc21 (1.42.30); FILE MERGED
2008/07/04 11:34:19 jsc 1.42.30.5: RESYNC: (1.45-1.47); FILE MERGED
2008/06/11 14:44:53 sb 1.42.30.4: RESYNC: (1.43-1.45); FILE MERGED
2008/04/23 09:50:52 jsc 1.42.30.3: RESYNC: (1.42-1.43); FILE MERGED
2008/04/11 12:37:15 jsc 1.42.30.2: #i86121# new rpath option for SDK related tools
2008/04/11 12:20:17 jsc 1.42.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:45:38 +00:00
Rüdiger Timm
26a77e78a2 INTEGRATION: CWS jsc21 (1.30.30); FILE MERGED
2008/06/11 14:44:42 sb 1.30.30.3: RESYNC: (1.31-1.33); FILE MERGED
2008/04/23 09:50:35 jsc 1.30.30.2: RESYNC: (1.30-1.31); FILE MERGED
2008/04/11 12:20:16 jsc 1.30.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:45:24 +00:00
Rüdiger Timm
039f08d310 INTEGRATION: CWS jsc21 (1.14.30); FILE MERGED
2008/06/11 14:44:38 sb 1.14.30.3: RESYNC: (1.15-1.16); FILE MERGED
2008/04/23 09:50:29 jsc 1.14.30.2: RESYNC: (1.14-1.15); FILE MERGED
2008/04/11 12:20:16 jsc 1.14.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:45:11 +00:00
Rüdiger Timm
bf21880782 INTEGRATION: CWS jsc21 (1.24.30); FILE MERGED
2008/06/11 14:44:34 sb 1.24.30.3: RESYNC: (1.25-1.26); FILE MERGED
2008/04/23 09:50:45 jsc 1.24.30.2: RESYNC: (1.24-1.25); FILE MERGED
2008/04/11 12:20:15 jsc 1.24.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:44:56 +00:00
Rüdiger Timm
6a1c312c9d INTEGRATION: CWS jsc21 (1.31.30); FILE MERGED
2008/06/11 14:44:28 sb 1.31.30.3: RESYNC: (1.32-1.33); FILE MERGED
2008/04/23 09:50:32 jsc 1.31.30.2: RESYNC: (1.31-1.32); FILE MERGED
2008/04/11 12:20:15 jsc 1.31.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:44:43 +00:00
Rüdiger Timm
cbc9b18dc8 INTEGRATION: CWS jsc21 (1.44.30); FILE MERGED
2008/06/11 14:44:24 sb 1.44.30.3: RESYNC: (1.45-1.46); FILE MERGED
2008/04/23 09:50:26 jsc 1.44.30.2: RESYNC: (1.44-1.45); FILE MERGED
2008/04/11 12:20:15 jsc 1.44.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:44:29 +00:00
Rüdiger Timm
60e29b47c6 INTEGRATION: CWS jsc21 (1.46.30); FILE MERGED
2008/06/11 14:44:18 sb 1.46.30.3: RESYNC: (1.47-1.48); FILE MERGED
2008/04/23 09:50:22 jsc 1.46.30.2: RESYNC: (1.46-1.47); FILE MERGED
2008/04/11 12:20:15 jsc 1.46.30.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:44:16 +00:00
Rüdiger Timm
dc4461e9c7 INTEGRATION: CWS jsc21 (1.2.64); FILE MERGED
2008/06/11 14:44:13 sb 1.2.64.3: RESYNC: (1.3-1.4); FILE MERGED
2008/04/23 09:50:19 jsc 1.2.64.2: RESYNC: (1.2-1.3); FILE MERGED
2008/04/11 12:20:15 jsc 1.2.64.1: #i86121# new rpath option for SDK related tools
2008-07-11 13:44:03 +00:00