summaryrefslogtreecommitdiffstats
path: root/filter/source/config/tools/merge
Commit message (Expand)AuthorAgeFilesLines
* Fix typoAndrea Gelmini2019-05-271-2/+2
* tdf#108523 Remove @author annotationsAbhyudaya Sharma2018-06-181-6/+3
* Fix typosAndrea Gelmini2016-10-031-1/+1
* Fix typosAndrea Gelmini2016-01-101-1/+1
* typo: more then -> more thanTakeshi Abe2014-08-011-1/+1
* Many spelling fixes: directories h* - p*.Pedro Giffuni2014-04-301-1/+1
* Many spelling fixes: directories a* - g*.Pedro Giffuni2014-04-301-1/+1
* typo fixesAndras Timar2013-12-201-1/+1
* FCFGMerge: Close files - silence warningThomas Arnhold2013-11-051-0/+2
* typo fixes in commentsAndras Timar2013-09-261-2/+2
* fdo#68552: try different build-time replacementMichael Stahl2013-09-051-2/+8
* fdo#60724 correct spellingThomas Arnhold2013-04-151-1/+1
* Fix Python problem in pyAltFCFGMerge at least on OS XTor Lillqvist2013-03-161-25/+30
* quiet FCFGMergePeter Foley2013-03-161-3/+6
* oops, path to FCFGMerge.cfg is hardcoded in the scriptMatúš Kukan2013-03-111-1/+1
* Python/pep8: fix E711 in filter/../pyAltFCFGMergeJulien Nabet2012-12-091-4/+4
* re-base on ALv2 code. Includes (at least) relevant parts of:Michael Meeks2012-11-062-22/+13
* Fix location of env binary to work on MacOSXNoel Grandin2012-04-301-1/+1
* l10ntools doesn't exist in the HOST solver for non-desktop OSesTor Lillqvist2011-09-261-1/+1
* Remove RCS headerThomas Arnhold2011-09-201-4/+0
* filter-fix-build-FCFGMerge.cfg.diff: fix build without javaRadek Doulik2011-04-281-0/+125
* python 3 compatibility fixesAndreas Becker2011-04-041-86/+72
* Correct inconsistent use of tabs and spacesTor Lillqvist2011-02-141-171/+171
* masterfix: #i10000# read cfg location from envIvo Hinkelmann2010-06-041-1/+1
* CWS-TOOLING: integrate CWS l10ntooling17Ivo Hinkelmann2010-06-041-1/+1
|\
| * l10ntooling17: #i110687# fetch cfg file from solverIvo Hinkelmann2010-05-311-2/+2
|/
* armeabi02: #i111427# fix without-javaCaolán McNamara2010-05-061-1/+1
* sb111: merged in DEV300_m68sb2010-01-051-1/+1
|\
| * #i104338#: fix build without JavaMathias Bauer2009-11-231-1/+1
* | merged in DEV300_m60sb2009-09-255-706/+0
|\|
| * CWS-TOOLING: integrate CWS l10nframework01Ivo Hinkelmann2009-09-165-706/+0
* | #i101955# consolidating xcs/xcu files in xcd files (for now in new postproces...sb2009-08-041-1/+0
|/
* CWS-TOOLING: integrate CWS cmcfixes58Release Engineers2009-05-072-5/+0
* CWS-TOOLING: integrate CWS sb93Vladimir Glazounov2008-10-011-2/+1
* INTEGRATION: CWS changefileheader (1.4.430); FILE MERGEDRüdiger Timm2008-04-112-46/+37
* INTEGRATION: CWS changefileheader (1.8.96); FILE MERGEDRüdiger Timm2008-04-111-23/+19
* INTEGRATION: CWS changefileheader (1.7.430); FILE MERGEDRüdiger Timm2008-04-111-23/+18
* INTEGRATION: CWS altfcfgmerge02 (1.2.640); FILE MERGEDVladimir Glazounov2007-12-071-15/+31
* INTEGRATION: CWS os2port01 (1.6.98); FILE MERGEDVladimir Glazounov2007-09-201-3/+3
* INTEGRATION: CWS ause069 (1.6.70); FILE MERGEDOliver Bolte2007-01-251-4/+4
* INTEGRATION: CWS warnings01 (1.5.150); FILE MERGEDJens-Heiner Rechtien2006-06-191-3/+3
* INTEGRATION: CWS ooo19126 (1.4.256); FILE MERGEDRüdiger Timm2005-09-081-48/+21
* INTEGRATION: CWS ooo19126 (1.6.116); FILE MERGEDRüdiger Timm2005-09-081-47/+21
* INTEGRATION: CWS ooo19126 (1.3.288); FILE MERGEDRüdiger Timm2005-09-081-47/+21
* INTEGRATION: CWS ooo19126 (1.3.116); FILE MERGEDRüdiger Timm2005-09-081-60/+34
* INTEGRATION: CWS fwkpostbeta1 (1.5.154); FILE MERGEDKurt Zenker2005-03-211-16/+57
* INTEGRATION: CWS fwkpostbeta1 (1.2.212); FILE MERGEDKurt Zenker2005-03-211-4/+4
* INTEGRATION: CWS sb20 (1.3.50); FILE MERGEDRüdiger Timm2004-07-231-3/+2
* INTEGRATION: CWS ooo20040509 (1.1.2); FILE ADDEDRüdiger Timm2004-06-161-0/+576
* INTEGRATION: CWS fwk02ea (1.4.12); FILE MERGEDKurt Zenker2004-06-101-3/+3