Kurt Zenker
b2ffa9c553
INTEGRATION: CWS vq34 (1.16.10); FILE MERGED
...
2006/07/12 21:27:35 vq 1.16.10.2: #i67170# Use Sun /bin/sh compatible syntax.
2006/07/11 21:24:45 vq 1.16.10.1: #i67170# Make winenv.set.sh /bin/sh compatible if _ISBOOTSTRAP_ is set.
2006-07-19 08:36:10 +00:00
Kurt Zenker
e720d95f17
INTEGRATION: CWS freebsd07 (1.168.2); FILE MERGED
...
2006/07/13 01:37:02 maho 1.168.2.2: RESYNC: (1.168-1.169); FILE MERGED
2006/07/13 01:25:41 maho 1.168.2.1: #i67139#
use = instaed of ==
2006-07-19 08:36:07 +00:00
Kurt Zenker
4a04ca132d
INTEGRATION: CWS freebsd07 (1.153.2); FILE MERGED
...
2006/07/13 01:36:55 maho 1.153.2.2: RESYNC: (1.153-1.154); FILE MERGED
2006/07/13 01:25:40 maho 1.153.2.1: #i67139#
use = instaed of ==
2006-07-19 08:35:49 +00:00
Kurt Zenker
9b40837bf6
INTEGRATION: CWS vq34 (1.176.18); FILE MERGED
...
2006/07/12 03:07:15 vq 1.176.18.1: #i67145# Make sure dependencies to SHL targets are honored by APPxTARGET.
2006-07-19 08:35:45 +00:00
Kurt Zenker
65aefd2922
INTEGRATION: CWS vq34 (1.6.256); FILE MERGED
...
2006/07/12 03:21:58 vq 1.6.256.1: #i67256# Remove unneeded debugging output.
2006-07-19 08:28:45 +00:00
Kurt Zenker
c051691f9f
INTEGRATION: CWS freebsd07 (1.1.2); FILE ADDED
...
2006/07/01 06:04:01 maho 1.1.2.1: FreeBSD/amd64 environment support.
This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
Issue number: 65513
Submitted by: jkim
2006-07-19 08:27:16 +00:00
Kurt Zenker
0fc0d944af
INTEGRATION: CWS freebsd07 (1.21.16); FILE MERGED
...
2006/07/08 04:06:30 maho 1.21.16.3: Resolve conflict again ;(
2006/07/08 03:07:56 maho 1.21.16.2: RESYNC: (1.21-1.22); FILE MERGED
2006/07/01 06:02:12 maho 1.21.16.1: #i65513#
FreeBSD/amd64 environment support.\n This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
2006-07-19 08:27:04 +00:00
Kurt Zenker
5c233b63c4
INTEGRATION: CWS freebsd07 (1.32.158); FILE MERGED
...
2006/07/01 06:02:12 maho 1.32.158.1: #i65513#
FreeBSD/amd64 environment support.\n This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
2006-07-19 08:26:37 +00:00
Oliver Bolte
1fa0e45f50
SRC680
2006-07-14 14:56:13 +00:00
Oliver Bolte
d3bf79b0b4
INTEGRATION: CWS extras8u4 (1.26.14); FILE MERGED
...
2006/07/10 10:31:06 va 1.26.14.2: #i59903# Disabled Patch flag.
2006/07/04 11:30:02 va 1.26.14.1: #i57687# Set Patch Flag.
2006-07-14 05:51:58 +00:00
Oliver Bolte
781ff16879
INTEGRATION: CWS jsc7 (1.16.344); FILE MERGED
...
2006/07/13 06:31:33 jsc 1.16.344.3: #i64810# adapt reg item for office extensions
2006/07/06 12:00:16 jsc 1.16.344.2: #i67071# register .oxt extension in windows registry
2006/05/04 14:38:08 jsc 1.16.344.1: #i64810# register file extension *.unopkg under windows
2006-07-13 16:00:38 +00:00
Oliver Bolte
f6b62d88cf
INTEGRATION: CWS jsc7 (1.44.2); FILE MERGED
...
2006/07/10 10:17:47 jl 1.44.2.1: #66211# package manager resources now in patch
2006-07-13 16:00:14 +00:00
Oliver Bolte
eb6a889894
INTEGRATION: CWS native54 (1.9.10); FILE MERGED
...
2006/07/11 09:38:49 is 1.9.10.1: #137913# patch on patch problem
2006-07-13 14:16:49 +00:00
Oliver Bolte
037a848257
INTEGRATION: CWS native54 (1.56.32); FILE MERGED
...
2006/07/11 10:46:26 is 1.56.32.1: #137670# no more download sets in cws
2006-07-13 14:15:45 +00:00
Oliver Bolte
b34d7f125c
INTEGRATION: CWS native54 (1.65.10); FILE MERGED
...
2006/07/11 10:45:02 is 1.65.10.1: #137670# no more download sets in cws
2006-07-13 14:14:37 +00:00
Oliver Bolte
2e3df64594
INTEGRATION: CWS pathoptions01 (1.22.46); FILE MERGED
...
2006/06/30 17:25:31 mav 1.22.46.2: RESYNC: (1.22-1.23); FILE MERGED
2006/06/26 07:25:04 as 1.22.46.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:31:34 +00:00
Oliver Bolte
9dca647290
INTEGRATION: CWS pathoptions01 (1.36.8); FILE MERGED
...
2006/07/11 09:08:18 mav 1.36.8.1: #i66157# install dtd file
2006-07-13 12:31:16 +00:00
Oliver Bolte
3cece5af7c
INTEGRATION: CWS pathoptions01 (1.156.12); FILE MERGED
...
2006/07/10 08:41:05 mav 1.156.12.4: #i66157# install dtd specification
2006/06/30 17:24:46 mav 1.156.12.3: RESYNC: (1.156-1.158); FILE MERGED
2006/06/19 09:10:56 as 1.156.12.2: #i66461# typo: Pathes-Paths
2006/06/15 12:43:46 as 1.156.12.1: #i66461# new config schema for pathes
2006-07-13 12:30:58 +00:00
Oliver Bolte
8ea8ea3cbc
INTEGRATION: CWS pathoptions01 (1.22.54); FILE MERGED
...
2006/06/30 17:23:19 mav 1.22.54.2: RESYNC: (1.22-1.23); FILE MERGED
2006/06/26 07:25:04 as 1.22.54.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:30:38 +00:00
Oliver Bolte
511a367467
INTEGRATION: CWS pathoptions01 (1.19.54); FILE MERGED
...
2006/06/26 07:25:04 as 1.19.54.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:30:20 +00:00
Oliver Bolte
d0b34cfb27
INTEGRATION: CWS pathoptions01 (1.29.52); FILE MERGED
...
2006/06/30 17:22:50 mav 1.29.52.2: RESYNC: (1.29-1.30); FILE MERGED
2006/06/26 07:25:03 as 1.29.52.1: #i66157# new property to handle the most actual document template filter for an OOo module
2006-07-13 12:30:03 +00:00
Oliver Bolte
142cba488a
INTEGRATION: CWS native55 (1.50.6); FILE MERGED
...
2006/07/11 08:03:34 is 1.50.6.2: #i67141# epm setting for no and internal
2006/07/10 11:38:15 is 1.50.6.1: #i67141# problem with value of EPM
2006-07-13 12:15:19 +00:00
Oliver Bolte
579c335573
INTEGRATION: CWS pathoptions01 (1.27.242); FILE MERGED
...
2006/07/11 10:06:45 mav 1.27.242.2: RESYNC: (1.27-1.28); FILE MERGED
2006/07/06 10:19:28 hjs 1.27.242.1: #137804# make zip*alllangiso overideable for not forcing all case
2006-07-13 11:08:18 +00:00
Oliver Bolte
d6e001395f
INTEGRATION: CWS pathoptions01 (1.25.242); FILE MERGED
...
2006/07/06 10:19:28 hjs 1.25.242.1: #137804# make zip*alllangiso overideable for not forcing all case
2006-07-13 11:08:06 +00:00
Oliver Bolte
aebd954804
INTEGRATION: CWS targetedaot2 (1.195.14); FILE MERGED
...
2006/07/11 12:46:54 cmc 1.195.14.1: #i67154# better to use the fact that the compiler is gcj, rather than the JDK is the GNU classpath one for default javac/javai
2006-07-13 10:13:32 +00:00
Oliver Bolte
9c3d9dd2ce
INTEGRATION: CWS cowfixes01 (1.33.48); FILE MERGED
...
2006/05/10 18:03:22 thb 1.33.48.2: RESYNC: (1.33-1.34); FILE MERGED
2006/04/21 09:56:29 lo 1.33.48.1: #134471#
2006-07-13 09:32:37 +00:00
Oliver Bolte
30a19f6d73
INTEGRATION: CWS cowfixes01 (1.192.22); FILE MERGED
...
2006/06/28 11:02:00 thb 1.192.22.3: RESYNC: (1.202-1.203); FILE MERGED
2006/05/10 18:00:36 thb 1.192.22.2: RESYNC: (1.192-1.202); FILE MERGED
2006/04/10 14:01:19 thb 1.192.22.1: #128078# Including bf_wrapper680 bf_frm680 bf_ofa680 bindet680 bf_lng680 bf_sd680 bf_migratefilter680 textconversiondlgs680 date680 egi680 productregistration.uno calc680 evoab1 fpicker.uno fwm680 eme680 epb680 epg680 ept680 epp680 era680 eti680 exp680 ips680 ime680 ipb680 icd680 ipx680 ipt680 ipd680 ira680 itg680 iti680 tfu680 icg680 uui680 tab bat basprov680li.uno avmedia680 dbext680 spell680 so680 socomp offacc680 flash680 smd680
2006-07-13 09:26:22 +00:00
Oliver Bolte
12c152caa9
INTEGRATION: CWS latex (1.11.236); FILE MERGED
...
2006/04/07 11:21:06 sus 1.11.236.1: #i16350# adding DocBook example tags to filters
2006-07-13 08:36:01 +00:00
Oliver Bolte
b04743544f
INTEGRATION: CWS latex (1.14.236); FILE MERGED
...
2006/04/07 09:53:36 sus 1.14.236.1: #i24813# Adding writer2latex.jar to the Writer module for pp3 productupdate
2006-07-13 08:35:50 +00:00
Oliver Bolte
84bae19b37
INTEGRATION: CWS latex (1.20.50); FILE MERGED
...
2006/07/06 10:22:10 sus 1.20.50.2: #i24813# Solving a merge error to m174
2006/04/07 09:53:36 sus 1.20.50.1: #i24813# Adding writer2latex.jar to the Writer module for pp3 productupdate
2006-07-13 08:35:32 +00:00
Oliver Bolte
6cd8730a78
INTEGRATION: CWS jl34 (1.202.12); FILE MERGED
...
2006/05/18 10:08:46 jl 1.202.12.1: #65266# cli_uno in patch
2006-07-13 07:32:55 +00:00
Oliver Bolte
8551de66a9
INTEGRATION: CWS vq33 (1.151.8); FILE MERGED
...
2006/07/03 19:00:16 vq 1.151.8.1: #i66767# Fix problem when tcsh appears as part of the path.
2006-07-10 18:05:10 +00:00
Oliver Bolte
0fcbbbfc83
INTEGRATION: CWS vq33 (1.166.8); FILE MERGED
...
2006/07/03 19:00:16 vq 1.166.8.1: #i66767# Fix problem when tcsh appears as part of the path.
2006-07-10 18:00:12 +00:00
Oliver Bolte
af84fa61dd
INTEGRATION: CWS vq33 (1.56.26); FILE MERGED
...
2006/07/03 18:52:05 vq 1.56.26.1: #i66881# Fix typo in makefile.
Patch by ericb@openoffice.org
2006-07-10 17:59:28 +00:00
Oliver Bolte
b10a8c483d
INTEGRATION: CWS vq33 (1.1.2); FILE ADDED
...
2006/07/03 19:16:40 vq 1.1.2.1: #i66706# Move udkversion.mk from sal/inc/ to solenv/inc/.
2006-07-10 17:51:45 +00:00
Oliver Bolte
e9dad76c7e
INTEGRATION: CWS vq33 (1.191.18); FILE MERGED
...
2006/07/03 19:16:40 vq 1.191.18.3: #i66706# Move udkversion.mk from sal/inc/ to solenv/inc/.
2006/06/24 03:09:29 vq 1.191.18.2: #i66705# Remove wrong .SUFFIXES targets.
2006/06/24 02:56:10 vq 1.191.18.1: #i66531# Fix "Macro `LAST_MINOR' redefined after use" warnings.
2006-07-10 17:51:36 +00:00
Oliver Bolte
1dc38b782e
INTEGRATION: CWS vq33 (1.32.110); FILE MERGED
...
2006/07/03 18:44:53 vq 1.32.110.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:51:25 +00:00
Oliver Bolte
3382767442
INTEGRATION: CWS vq33 (1.22.272); FILE MERGED
...
2006/07/03 18:44:53 vq 1.22.272.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:51:00 +00:00
Oliver Bolte
c349dd8d9e
INTEGRATION: CWS vq33 (1.53.52); FILE MERGED
...
2006/07/03 18:44:53 vq 1.53.52.1: #i66940# Make the scripts aware of bash as possible shell.
2006-07-10 17:49:40 +00:00
Oliver Bolte
318548a63d
SRC680
2006-07-10 17:12:41 +00:00
Oliver Bolte
9b160502b8
INTEGRATION: CWS qiq (1.34.56); FILE MERGED
...
2006/06/27 11:04:45 fs 1.34.56.2: RESYNC: (1.34-1.36); FILE MERGED
2006/05/24 07:01:15 fs 1.34.56.1: new lib sdbt
2006-07-10 15:17:20 +00:00
Oliver Bolte
8610f1378f
INTEGRATION: CWS qiq (1.43.20); FILE MERGED
...
2006/06/27 11:04:21 fs 1.43.20.2: RESYNC: (1.43-1.44); FILE MERGED
2006/05/24 06:58:43 fs 1.43.20.1: new lib sdbt
2006-07-10 15:16:26 +00:00
Oliver Bolte
e36d866614
INTEGRATION: CWS qiq (1.201.6); FILE MERGED
...
2006/06/27 11:03:55 fs 1.201.6.2: RESYNC: (1.201-1.203); FILE MERGED
2006/05/24 06:58:42 fs 1.201.6.1: new lib sdbt
2006-07-10 15:16:15 +00:00
Oliver Bolte
4bbf4d0174
INTEGRATION: CWS linuxppcrpm (1.34.68); FILE MERGED
...
2006/07/02 16:31:24 ericb 1.34.68.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 10:00:31 +00:00
Oliver Bolte
00b890b1b2
INTEGRATION: CWS linuxppcrpm (1.33.162); FILE MERGED
...
2006/07/02 16:31:24 ericb 1.33.162.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 10:00:18 +00:00
Oliver Bolte
954c60fade
INTEGRATION: CWS linuxppcrpm (1.49.90); FILE MERGED
...
2006/07/02 16:31:24 ericb 1.49.90.1: #i66719# linuxppcrpm make rpm buildable on Debian or Ubuntu distribution
2006-07-10 09:59:57 +00:00
Nakata Maho
6e6661f2eb
Fix conflicts
2006-07-08 02:16:08 +00:00
Kurt Zenker
2b2ad26bcf
SRC680
2006-07-06 15:08:18 +00:00
Kurt Zenker
10e802322c
INTEGRATION: CWS warningfixes01 (1.2.2); FILE MERGED
...
2006/06/27 12:34:08 sb 1.2.2.2: #i66700# Minimal adaption to cygwin platform (no functional testhxx yet, but build does not break any more).
2006/06/27 08:44:28 sb 1.2.2.1: #i66725# CAPTURE_COMMAND must be set before settings.mk is included.
2006-07-06 13:24:28 +00:00
Kurt Zenker
26d7b1017e
INTEGRATION: CWS warningfixes01 (1.2.2); FILE MERGED
...
2006/06/27 12:34:08 sb 1.2.2.1: #i66700# Minimal adaption to cygwin platform (no functional testhxx yet, but build does not break any more).
2006-07-06 13:24:17 +00:00