summaryrefslogtreecommitdiff
path: root/filter/source/config/tools/merge
AgeCommit message (Expand)AuthorFilesLines
2014-08-01typo: more then -> more thanTakeshi Abe1-1/+1
2014-04-30Many spelling fixes: directories h* - p*.Pedro Giffuni1-1/+1
2014-04-30Many spelling fixes: directories a* - g*.Pedro Giffuni1-1/+1
2013-12-20typo fixesAndras Timar1-1/+1
2013-11-05FCFGMerge: Close files - silence warningThomas Arnhold1-0/+2
2013-09-26typo fixes in commentsAndras Timar1-2/+2
2013-09-05fdo#68552: try different build-time replacementMichael Stahl1-2/+8
2013-04-15fdo#60724 correct spellingThomas Arnhold1-1/+1
2013-03-16Fix Python problem in pyAltFCFGMerge at least on OS XTor Lillqvist1-25/+30
2013-03-16quiet FCFGMergePeter Foley1-3/+6
2013-03-11oops, path to FCFGMerge.cfg is hardcoded in the scriptMatúš Kukan1-1/+1
2012-12-09Python/pep8: fix E711 in filter/../pyAltFCFGMergeJulien Nabet1-4/+4
2012-11-06re-base on ALv2 code. Includes (at least) relevant parts of:Michael Meeks2-22/+13
2012-04-30Fix location of env binary to work on MacOSXNoel Grandin1-1/+1
2011-09-26l10ntools doesn't exist in the HOST solver for non-desktop OSesTor Lillqvist1-1/+1
2011-09-20Remove RCS headerThomas Arnhold1-4/+0
2011-04-28filter-fix-build-FCFGMerge.cfg.diff: fix build without javaRadek Doulik1-0/+125
2011-04-04python 3 compatibility fixesAndreas Becker1-86/+72
2011-02-14Correct inconsistent use of tabs and spacesTor Lillqvist1-171/+171
2010-06-04masterfix: #i10000# read cfg location from envIvo Hinkelmann1-1/+1
2010-06-04CWS-TOOLING: integrate CWS l10ntooling17Ivo Hinkelmann1-1/+1
2010-05-31l10ntooling17: #i110687# fetch cfg file from solverIvo Hinkelmann1-2/+2
2010-05-06armeabi02: #i111427# fix without-javaCaolán McNamara1-1/+1
2010-01-05sb111: merged in DEV300_m68sb1-1/+1
2009-11-23#i104338#: fix build without JavaMathias Bauer1-1/+1
2009-09-25merged in DEV300_m60sb5-706/+0
2009-09-16CWS-TOOLING: integrate CWS l10nframework01Ivo Hinkelmann5-706/+0
2009-08-04#i101955# consolidating xcs/xcu files in xcd files (for now in new postproces...sb1-1/+0
2009-05-07CWS-TOOLING: integrate CWS cmcfixes58Release Engineers2-5/+0
2008-10-01CWS-TOOLING: integrate CWS sb93Vladimir Glazounov1-2/+1
2008-04-11INTEGRATION: CWS changefileheader (1.4.430); FILE MERGEDRüdiger Timm2-46/+37
2008-04-11INTEGRATION: CWS changefileheader (1.8.96); FILE MERGEDRüdiger Timm1-23/+19
2008-04-11INTEGRATION: CWS changefileheader (1.7.430); FILE MERGEDRüdiger Timm1-23/+18
2007-12-07INTEGRATION: CWS altfcfgmerge02 (1.2.640); FILE MERGEDVladimir Glazounov1-15/+31
2007-09-20INTEGRATION: CWS os2port01 (1.6.98); FILE MERGEDVladimir Glazounov1-3/+3
2007-01-25INTEGRATION: CWS ause069 (1.6.70); FILE MERGEDOliver Bolte1-4/+4
2006-06-19INTEGRATION: CWS warnings01 (1.5.150); FILE MERGEDJens-Heiner Rechtien1-3/+3
2005-09-08INTEGRATION: CWS ooo19126 (1.4.256); FILE MERGEDRüdiger Timm1-48/+21
2005-09-08INTEGRATION: CWS ooo19126 (1.6.116); FILE MERGEDRüdiger Timm1-47/+21
2005-09-08INTEGRATION: CWS ooo19126 (1.3.288); FILE MERGEDRüdiger Timm1-47/+21
2005-09-08INTEGRATION: CWS ooo19126 (1.3.116); FILE MERGEDRüdiger Timm1-60/+34
2005-03-21INTEGRATION: CWS fwkpostbeta1 (1.5.154); FILE MERGEDKurt Zenker1-16/+57
2005-03-21INTEGRATION: CWS fwkpostbeta1 (1.2.212); FILE MERGEDKurt Zenker1-4/+4
2004-07-23INTEGRATION: CWS sb20 (1.3.50); FILE MERGEDRüdiger Timm1-3/+2
2004-06-16INTEGRATION: CWS ooo20040509 (1.1.2); FILE ADDEDRüdiger Timm1-0/+576
2004-06-10INTEGRATION: CWS fwk02ea (1.4.12); FILE MERGEDKurt Zenker1-3/+3
2004-06-10INTEGRATION: CWS fwk02ea (1.2.58); FILE MERGEDKurt Zenker1-3/+3
2004-04-21INTEGRATION: CWS loadenv01 (1.3.22); FILE MERGEDSander Vesik1-48/+21
2004-03-09INTEGRATION: CWS ooo20040225 (1.2.8); FILE MERGEDJens-Heiner Rechtien1-2/+5
2004-02-05#i25034,100000#: change tmpfile mechanismJens-Heiner Rechtien1-2/+8
generated by cgit v1.2.1 (git 2.18.0) at 2023-03-30 20:09:27 +0000