Commit graph

23 commits

Author SHA1 Message Date
Nakata Maho
6e6661f2eb Fix conflicts 2006-07-08 02:16:08 +00:00
Kurt Zenker
97997619cb INTEGRATION: CWS ause058 (1.20.132); FILE MERGED
2006/06/26 12:30:31 hjs 1.20.132.2: RESYNC: (1.20-1.21); FILE MERGED
2006/06/13 16:21:20 hjs 1.20.132.1: #i55987# seperate INCLUDE from CFLAGS; introduce INCLUDE_C for include path without stlport
2006-07-05 21:01:09 +00:00
Jens-Heiner Rechtien
225fe63696 INTEGRATION: CWS warnings01 (1.16.56); FILE MERGED
2006/04/07 18:31:38 sb 1.16.56.5: RESYNC: (1.19-1.20); FILE MERGED
2005/11/09 10:34:29 sb 1.16.56.4: #i53898# CFLAGSWARN...: cleaned up and incorporated changes already made for unxlngi6.mk.
2005/11/07 17:19:08 pl 1.16.56.3: RESYNC: (1.18-1.19); FILE MERGED
2005/09/22 23:25:42 sb 1.16.56.2: RESYNC: (1.16-1.18); FILE MERGED
2005/08/29 11:48:50 sb 1.16.56.1: #i53898# Changed and extended CFLAGSDFTLWARN/CFLAGSWALL to CFLAGS{WARN|WALL|WERR}{CC|CXX}.
2006-06-19 16:13:50 +00:00
Kurt Zenker
e18b44ea9f INTEGRATION: CWS freebsd04 (1.19.158); FILE MERGED
2006/01/19 01:25:30 maho 1.19.158.1: #i56956#
catch up to recent version of solenv/inc/unxlngi6.mk
2006-01-31 17:24:38 +00:00
Kurt Zenker
0b37032561 INTEGRATION: CWS pj34 (1.18.24); FILE MERGED
2005/09/21 19:07:08 pjanik 1.18.24.1: #i54621#: fix common typo.
2005-10-05 10:33:12 +00:00
Rüdiger Timm
0fb873cf5d INTEGRATION: CWS ooo19126 (1.17.8); FILE MERGED
2005/09/05 14:34:01 rt 1.17.8.1: #i54170# Change license header: remove SISSL
2005-09-08 08:52:53 +00:00
Rüdiger Timm
e8d59f6999 INTEGRATION: CWS mh19121 (1.16.46); FILE MERGED
2005/08/15 12:23:08 mh 1.16.46.1: #i53285#, chg flags for new gcc
2005-08-18 11:04:47 +00:00
Kurt Zenker
7b7e4f1414 INTEGRATION: CWS ause030 (1.14.6); FILE MERGED
2005/06/20 13:34:33 hjs 1.14.6.1: #i47954# introduce ARCH_FLAG
2005-07-11 14:50:11 +00:00
Jens-Heiner Rechtien
458924e804 INTEGRATION: CWS ause028 (1.13.128); FILE MERGED
2005/05/18 10:26:22 hjs 1.13.128.1: #i45002# support gcc 3.3.x version (-mcpu/-mtune)
2005-06-09 13:53:38 +00:00
Kurt Zenker
236e9f734e INTEGRATION: CWS freebsd03 (1.13.136); FILE MERGED
2005/05/25 03:32:03 maho 1.13.136.1: Update unxfbsdi.mk to recent version of unxlngi6.mk

Issue number:  #i49685#
2005-05-31 15:31:10 +00:00
Jens-Heiner Rechtien
010523e2ce INTEGRATION: CWS fpic1 (1.12.32); FILE MERGED
2005/02/01 14:40:41 cmc 1.12.32.1: #i41014# centralize -fpic/-fPIC into one variable
2005-02-11 14:27:55 +00:00
Kurt Zenker
aae5d7cad1 INTEGRATION: CWS pj16 (1.11.122); FILE MERGED
2005/01/14 17:56:35 pjanik 1.11.122.1: #i40182#: FreeBSD porting: catch up recent version of
solenv/inc/unxfbsdi.mk (unxlngi6.mk).

From NAKATA Maho.
2005-01-18 14:05:22 +00:00
Rüdiger Timm
60cb237124 INTEGRATION: CWS ause011 (1.10.2); FILE MERGED
2004/09/17 15:07:42 hjs 1.10.2.1: #i30873# removed one specific warning
2004-09-20 07:37:13 +00:00
Jens-Heiner Rechtien
697831056c INTEGRATION: CWS ooo20040815 (1.9.72); FILE MERGED
2004/07/28 10:29:29 waratah 1.9.72.2: Remove -fno-for-scope and -fpermissive from all parameters
2004/07/28 07:18:13 pjanik 1.9.72.1: #i31791#: Remove -fno-for-scope which was deprecated for OpenOffice.org builds.
2004-09-09 10:15:54 +00:00
Sander Vesik
9a221f529d INTEGRATION: CWS ooo20040329 (1.8.44); FILE MERGED
2004/03/29 06:21:45 pjanik 1.8.44.1: #i27039#: Add $(STDLIBCPP) for stlport.
2004-04-21 12:54:46 +00:00
Vladimir Glazounov
0a9712cd1f INTEGRATION: CWS geordi2q11 (1.7.80); FILE MERGED
2003/12/16 16:14:14 hr 1.7.80.1: #111934#: join CWS ooo111fix1
2003-12-17 17:07:58 +00:00
Vladimir Glazounov
1f2edabf63 INTEGRATION: CWS mh11rc (1.6.16); FILE MERGED
2003/06/05 14:30:38 mh 1.6.16.1: join: from beta2
2003-06-12 09:01:53 +00:00
Jens-Heiner Rechtien
b0ab59d71b INTEGRATION: CWS ooo20030412 (1.4.22.1.34); FILE MERGED
2003/03/27 11:37:03 waratah 1.4.22.1.34.1: 11233: enable standard warnings from the gcc compiler on latest 644 branch
2003-04-28 15:46:28 +00:00
Jens-Heiner Rechtien
eb62b06be2 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 10:48:49 +00:00
Philipp Lohmann
8432719610 #92403# remove Xt/Xm/Xaw/Xmu from office 2001-10-24 16:21:47 +00:00
Sander Vesik
4880eeb1a1 Update freebsd support.
Contributed by: Tim Tretyak <timothy@umc.com.ua>
2001-04-08 20:05:54 +00:00
Sander Vesik
b730d09025 Update. Patch contributed by: Tim Tretyak <timothy@umc.com.ua> 2000-11-06 09:49:12 +00:00
Jens-Heiner Rechtien
22c7f3f170 initial import 2000-09-20 13:43:26 +00:00