summaryrefslogtreecommitdiff
path: root/filter/source/config/tools/merge
AgeCommit message (Expand)Author
2012-04-30Fix location of env binary to work on MacOSXNoel Grandin
2011-09-26l10ntools doesn't exist in the HOST solver for non-desktop OSesTor Lillqvist
2011-09-20Remove RCS headerThomas Arnhold
2011-04-28filter-fix-build-FCFGMerge.cfg.diff: fix build without javaRadek Doulik
2011-04-04python 3 compatibility fixesAndreas Becker
2011-02-14Correct inconsistent use of tabs and spacesTor Lillqvist
2010-06-04masterfix: #i10000# read cfg location from envIvo Hinkelmann
2010-06-04CWS-TOOLING: integrate CWS l10ntooling17Ivo Hinkelmann
2010-05-31l10ntooling17: #i110687# fetch cfg file from solverIvo Hinkelmann
2010-05-06armeabi02: #i111427# fix without-javaCaolán McNamara
2010-01-05sb111: merged in DEV300_m68sb
2009-11-23#i104338#: fix build without JavaMathias Bauer
2009-09-25merged in DEV300_m60sb
2009-09-16CWS-TOOLING: integrate CWS l10nframework01Ivo Hinkelmann
2009-08-04#i101955# consolidating xcs/xcu files in xcd files (for now in new postproces...sb
2009-05-07CWS-TOOLING: integrate CWS cmcfixes58Release Engineers
2008-10-01CWS-TOOLING: integrate CWS sb93Vladimir Glazounov
2008-04-11INTEGRATION: CWS changefileheader (1.4.430); FILE MERGEDRüdiger Timm
2008-04-11INTEGRATION: CWS changefileheader (1.8.96); FILE MERGEDRüdiger Timm
2008-04-11INTEGRATION: CWS changefileheader (1.7.430); FILE MERGEDRüdiger Timm
2007-12-07INTEGRATION: CWS altfcfgmerge02 (1.2.640); FILE MERGEDVladimir Glazounov
2007-09-20INTEGRATION: CWS os2port01 (1.6.98); FILE MERGEDVladimir Glazounov
2007-01-25INTEGRATION: CWS ause069 (1.6.70); FILE MERGEDOliver Bolte
2006-06-19INTEGRATION: CWS warnings01 (1.5.150); FILE MERGEDJens-Heiner Rechtien
2005-09-08INTEGRATION: CWS ooo19126 (1.4.256); FILE MERGEDRüdiger Timm
2005-09-08INTEGRATION: CWS ooo19126 (1.6.116); FILE MERGEDRüdiger Timm
2005-09-08INTEGRATION: CWS ooo19126 (1.3.288); FILE MERGEDRüdiger Timm
2005-09-08INTEGRATION: CWS ooo19126 (1.3.116); FILE MERGEDRüdiger Timm
2005-03-21INTEGRATION: CWS fwkpostbeta1 (1.5.154); FILE MERGEDKurt Zenker
2005-03-21INTEGRATION: CWS fwkpostbeta1 (1.2.212); FILE MERGEDKurt Zenker
2004-07-23INTEGRATION: CWS sb20 (1.3.50); FILE MERGEDRüdiger Timm
2004-06-16INTEGRATION: CWS ooo20040509 (1.1.2); FILE ADDEDRüdiger Timm
2004-06-10INTEGRATION: CWS fwk02ea (1.4.12); FILE MERGEDKurt Zenker
2004-06-10INTEGRATION: CWS fwk02ea (1.2.58); FILE MERGEDKurt Zenker
2004-04-21INTEGRATION: CWS loadenv01 (1.3.22); FILE MERGEDSander Vesik
2004-03-09INTEGRATION: CWS ooo20040225 (1.2.8); FILE MERGEDJens-Heiner Rechtien
2004-02-05#i25034,100000#: change tmpfile mechanismJens-Heiner Rechtien
2004-01-28INTEGRATION: CWS filtercfg (1.1.2); FILE ADDEDKurt Zenker
2004-01-28INTEGRATION: CWS filtercfg (1.1.2); FILE ADDEDKurt Zenker
2004-01-28INTEGRATION: CWS filtercfg (1.1.2); FILE ADDEDKurt Zenker
2004-01-28INTEGRATION: CWS filtercfg (1.1.2); FILE ADDEDKurt Zenker
2004-01-28INTEGRATION: CWS filtercfg (1.1.2); FILE ADDEDKurt Zenker