summaryrefslogtreecommitdiff
path: root/filter/source/config/tools/merge/pyAltFCFGMerge
AgeCommit message (Expand)AuthorFilesLines
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-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 Meeks1-1/+1
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-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-08-04#i101955# consolidating xcs/xcu files in xcd files (for now in new postproces...sb1-1/+0
2007-12-07INTEGRATION: CWS altfcfgmerge02 (1.2.640); FILE MERGEDVladimir Glazounov1-15/+31
2004-06-16INTEGRATION: CWS ooo20040509 (1.1.2); FILE ADDEDRüdiger Timm1-0/+576