 marco
|
bcb47e7c64
--- Merging r40995 into '.':
|
6 years ago |
|
marco
|
1a93a41c86
* recorded mergeinfo from Yury's pas2jni merge revs 41314, 41320, 41323, 41371, 41374, 41391, 41396
|
6 years ago |
|
marco
|
f2dfbe645e
--- Merging r41673 into '.':
|
6 years ago |
|
marco
|
4fd1f5ebe7
--- Merging r41637 into '.':
|
6 years ago |
|
marco
|
3de6dfa4fb
* some IDE fixes merged
|
6 years ago |
|
marco
|
427d60db4d
--- Merging r39993 into '.':
|
6 years ago |
|
marco
|
15b84360ab
--- Merging r40804 into '.':
|
6 years ago |
|
marco
|
a857741040
--- Merging r40842 into '.':
|
6 years ago |
 pierre
|
554d1f4b57
------------------------------------------------------------------------
|
6 years ago |
|
pierre
|
aa33dfcdcc
Merge of commits 41767 and 41768 into fixes branch:
|
6 years ago |
|
pierre
|
8b356ea8d7
Fix compilation of BSD targets following latest OpenBSD merges
|
6 years ago |
|
marco
|
5c0a5db4bd
--- Merging r41640 into '.':
|
6 years ago |
|
marco
|
b99879b91b
--- Merging r41747 into '.':
|
6 years ago |
 yury
|
99c2a15203
Merged revision(s) 41627 from trunk:
|
6 years ago |
|
yury
|
0d2cb32aad
Merged revision(s) 41625 from trunk:
|
6 years ago |
|
pierre
|
663c97ed23
Merge of revisions 41425 from trunk to fixes_3_2
|
6 years ago |
|
yury
|
fcc7daf98d
Merged revision(s) 41412 from trunk:
|
6 years ago |
|
yury
|
61568c5e3d
Merged revision(s) 41393-41394 from trunk:
|
6 years ago |
|
yury
|
cd3d2c2abc
Merged revision(s) 41314, 41320, 41323, 41371, 41374, 41391, 41396 from trunk:
|
6 years ago |
|
yury
|
5ed8ce23a2
Merged revision(s) 41400, 41459 from trunk:
|
6 years ago |
|
marco
|
a92567f056
--- Merging r40956 into '.':
|
6 years ago |
|
marco
|
f91e313eef
--- Merging r40805 into '.':
|
6 years ago |
|
marco
|
0b7aab430e
--- Merging r41262 into '.':
|
6 years ago |
|
marco
|
6ebff8062d
--- Merging r41268 into '.':
|
6 years ago |
|
marco
|
ad69839b34
--- Merging r41264 into '.':
|
6 years ago |
|
marco
|
e22ca656c5
--- Merging r41253 into '.':
|
6 years ago |
|
marco
|
7d336b1638
--- Merging r40496 into '.':
|
6 years ago |
 Jonas Maebe
|
3ac703506c
* rest of the previous accidental partial commit
|
6 years ago |
|
Jonas Maebe
|
b40797e7f8
--- Merging r39844 into '.':
|
6 years ago |
|
pierre
|
5fa93e2a1e
------------------------------------------------------------------------
|
6 years ago |
