 Jonas Maebe
|
0b2e073bad
* version bump to 3.0.5
|
7 年之前 |
|
Jonas Maebe
|
c8c3a77d7b
* merged everything except for version bumps from fixes_3_0 till 37113
|
7 年之前 |
|
Jonas Maebe
|
381af40673
--- Merging r33922 into '.':
|
8 年之前 |
|
Jonas Maebe
|
28a640f9c1
* synchronised with fixes_3_0 + r32271 to fix compilation after merge
|
9 年之前 |
|
Jonas Maebe
|
c1b7738d2b
+ added test file missing from merge in r31984
|
9 年之前 |
|
Jonas Maebe
|
1570437996
- reverted merge of r32824: that commit contained new functionality,
|
9 年之前 |
 marco
|
04dc706dbe
--- Merging r33894 into '.':
|
9 年之前 |
|
marco
|
996809edc7
--- Merging r33898 into '.':
|
9 年之前 |
|
marco
|
95bab9691d
* disable fcl-pdf for nativeNT manually.
|
9 年之前 |
|
marco
|
70aec083c1
--- Merging r33882 into '.':
|
9 年之前 |
|
marco
|
3e49f952ae
--- Merging r32864 into '.':
|
9 年之前 |
|
marco
|
b644d609cb
* partially merge 30274 to fix embedded (not recorded), mantis #30221
|
9 年之前 |
|
marco
|
ea23385d59
* revert pos(offs,string)
|
9 年之前 |
|
marco
|
2afe1cf19f
--- Merging r32354 into '.':
|
9 年之前 |
|
marco
|
4d72f97d75
# revisions: reversemerge 33713 and 33714
|
9 年之前 |
|
marco
|
0412d28156
--- Merging r33711 into '.':
|
9 年之前 |
|
marco
|
05349cdb81
--- Merging r30016 into '.':
|
9 年之前 |
|
marco
|
f18c6b3273
--- Merging r32277 into '.':
|
9 年之前 |
|
marco
|
c67f8f2a28
--- Merging r32845 into '.':
|
9 年之前 |
|
marco
|
bce375dc3a
--- Merging r31434 into '.':
|
9 年之前 |
|
marco
|
f8e7eddefc
--- Merging r33429 into '.':
|
9 年之前 |
|
marco
|
80d45f6b2d
* patch from Sven equal to r31911 backported to 3.0.x
|
9 年之前 |
|
Jonas Maebe
|
ef803262e8
Merging 30268,32182,32399,33379,33380,33393,33498,33594,33595
|
9 年之前 |
|
Jonas Maebe
|
5addbae947
Merging r33630
|
9 年之前 |
|
Jonas Maebe
|
a7fb19313a
Merging -c 29493,29826,31916,32447,33176:33180,33190
|
9 年之前 |
|
Jonas Maebe
|
5107d65b32
Merging r33050
|
9 年之前 |
|
Jonas Maebe
|
feb56205b3
Merging r32904
|
9 年之前 |
|
marco
|
874a86309f
# revisions: 32540,32818,32939,33299,33305,33328,33329,33339,33342,33344,33700,33829
|
9 年之前 |
|
marco
|
38a19f9f32
# revisions: 33059,33060,33153,33209,33238
|
9 年之前 |
|
marco
|
60f442447d
# revisions: 31464,31467,31468,33055,33056,33057,33058
|
9 年之前 |
