 marco
|
46533ea1e8
--- Merging r49040 into '.':
|
4 years ago |
|
marco
|
44383938f9
--- Merging r49080 into '.':
|
4 years ago |
 svenbarth
|
66fa732720
Merged revision(s) 47634, 47655 from trunk:
|
4 years ago |
|
marco
|
fabc7fb50f
--- Merging r48752 into '.':
|
4 years ago |
 pierre
|
7eaac123c0
Fix error in conflict resolution of previous merge
|
4 years ago |
|
pierre
|
e1b53067a6
Merge commit 48814:
|
4 years ago |
|
marco
|
ae86b74955
--- Merging r48876 into '.':
|
4 years ago |
|
marco
|
994797ef11
--- Merging r48967 into '.':
|
4 years ago |
|
marco
|
8dd4e2e281
--- Merging r48982 into '.':
|
4 years ago |
 michael
|
e2980ac39b
* Merging revisions r48716 from trunk:
|
4 years ago |
|
michael
|
771b27632f
* Merging revisions r48864 from trunk:
|
4 years ago |
|
michael
|
8f12e787fa
* Merging revisions r48898,r48899,r48900,r48901 from trunk:
|
4 years ago |
|
michael
|
08dc64ec0d
* Merging revisions r48926,r48931 from trunk:
|
4 years ago |
|
pierre
|
855efcaad6
Merge commit 48814:
|
4 years ago |
 Tomas Hajny
|
60a2725d2b
+ missing package tplylib added
|
4 years ago |
 Jonas Maebe
|
b7ffb412e4
--- Merging r48762 into '.':
|
4 years ago |
|
michael
|
4f32872a71
* Fix missing ftLongWord
|
4 years ago |
|
michael
|
84ec1e3794
* Merging revisions 48695,48705 from trunk:
|
4 years ago |
|
michael
|
0d71b5ede0
* Merging revisions 48702 from trunk:
|
4 years ago |
|
michael
|
19126c8f4e
* Merging revisions 48694,48696,48697 from trunk:
|
4 years ago |
|
michael
|
4fc1e8986a
* Merging revisions 48692 from trunk:
|
4 years ago |
|
marco
|
b7a08a0150
--- Merging r48525 into '.':
|
4 years ago |
 Károly Balogh
|
ab4f34e3ff
* Merging recent m68k FPU fixes from trunk: r42829, r48413, r48414, r48522, r48523, r48524
|
4 years ago |
|
Jonas Maebe
|
0fd8418376
--- Merging r48664 into '.':
|
4 years ago |
|
Jonas Maebe
|
a179aa0c2c
--- Merging r48662 into '.':
|
4 years ago |
|
svenbarth
|
f455d66a75
Merged revision(s) 47794-47795, 47826 from trunk:
|
4 years ago |
|
Jonas Maebe
|
371bb9fd58
--- Merging r48518 into '.':
|
4 years ago |
|
marco
|
48ba8f691d
--- Merging r48428 into '.':
|
4 years ago |
|
pierre
|
c0b2f99585
* Merging of commit 48227
|
4 years ago |
|
svenbarth
|
a61d4b3eb6
Merged revision(s) 48496 from trunk:
|
4 years ago |
