summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* * version bump to 3.0.5fixes_3_0_iosjonas2017-11-16487-610/+612
* * merged everything except for version bumps from fixes_3_0 till 37113jonas2017-11-16688-11002/+98685
* --- Merging r33922 into '.':jonas2016-11-262-23/+89
* * synchronised with fixes_3_0 + r32271 to fix compilation after mergejonas2016-06-05810-215756/+660412
|\
| * + added test file missing from merge in r31984jonas2016-06-051-0/+31
| * - reverted merge of r32824: that commit contained new functionality,jonas2016-06-052-67/+0
| * --- Merging r33894 into '.':marco2016-06-045-7/+8
| * --- Merging r33898 into '.':marco2016-06-041-1/+1
| * * disable fcl-pdf for nativeNT manually.marco2016-06-041-1/+1
| * --- Merging r33882 into '.':marco2016-06-0221-22/+22
| * --- Merging r32864 into '.':marco2016-06-021-4/+4
| * * partially merge 30274 to fix embedded (not recorded), mantis #30221marco2016-06-011-0/+14
| * * revert pos(offs,string)marco2016-06-0112-180/+75
| * --- Merging r32354 into '.':marco2016-06-012-2/+2
| * # revisions: reversemerge 33713 and 33714marco2016-06-013-105/+87
| * --- Merging r33711 into '.':marco2016-06-013-1/+272
| * --- Merging r30016 into '.':marco2016-05-311-9/+23
| * --- Merging r32277 into '.':marco2016-05-311-6/+10
| * --- Merging r32845 into '.':marco2016-05-312-6/+31
| * --- Merging r31434 into '.':marco2016-05-311-0/+13
| * --- Merging r33429 into '.':marco2016-05-304-33/+143
| * * patch from Sven equal to r31911 backported to 3.0.xmarco2016-05-301-3/+5
| * Merging r33630jonas2016-05-292-11/+78
| * Merging -c 29493,29826,31916,32447,33176:33180,33190jonas2016-05-299-194/+187
| * Merging r33050jonas2016-05-293-65/+68
| * Merging r32904jonas2016-05-292-1/+27
| * # revisions: 32540,32818,32939,33299,33305,33328,33329,33339,33342,33344,3370...marco2016-05-2810-298/+446
| * # revisions: 33059,33060,33153,33209,33238marco2016-05-284-17/+48
| * # revisions: 31464,31467,31468,33055,33056,33057,33058marco2016-05-2812-75/+180
| * # revisions: 32266marco2016-05-281-0/+8
| * # revisions: 32265marco2016-05-281-7/+7
| * # revisions: 31603marco2016-05-282-1/+21
| * --- Merging r33362 into '.':marco2016-05-263-2/+18
| * --- Merging r32858 into '.':marco2016-05-262-144/+144
| * --- Merging r31752 into '.':marco2016-05-268-61/+61
| * --- Merging r33697 into '.':marco2016-05-2614-589/+1085
| * --- Merging r33346 into '.':marco2016-05-261-1/+1
| * --- Merging r30638 into '.':marco2016-05-261-35/+89
| * --- Merging r32357 into '.':marco2016-05-262-35/+77
| * --- Merging r32336 into '.':marco2016-05-260-0/+0
| * --- Merging r33761 into '.':marco2016-05-266-14/+76
| * * reverse merge of 33057marco2016-05-251-1/+1
| * reverse merge of r31464,r31468,r33056marco2016-05-257-78/+67
| * # revisions: 31464,31468marco2016-05-255-46/+57
| * # revisions: 33258,33299,33300,33305,33330,33340,33343marco2016-05-257-8/+33
| * # revisions: 33030,33056,33057,33100,33101marco2016-05-257-26/+241
| * # revisions: 32730,32817marco2016-05-253-2/+29
| * # revisions: 32067,32068,32069,32081,32082,32104,32105,32355,32798,32799marco2016-05-256-10/+891
| * # revisions: 32337marco2016-05-254-8/+10
| * # revisions: 32067marco2016-05-2532-0/+8068