 marco
|
41d3e40e0f
--- Merging r26418 into '.':
|
11 years ago |
|
marco
|
236c0adbf0
--- Merging r26421 into '.':
|
11 years ago |
|
marco
|
a925545bcf
--- Merging r26408 into '.':
|
11 years ago |
 Jonas Maebe
|
e56ce79483
* avoid Xcode 5 linker issues on Darwin/x86-64 with certain Objective-Pascal
|
11 years ago |
|
marco
|
178696220f
--- Merging r26171 into '.':
|
11 years ago |
|
marco
|
db877c2200
--- Merging r26320 into '.':
|
11 years ago |
|
marco
|
e87c2b4e75
* also build the mysql 5.6 connection
|
11 years ago |
|
marco
|
d2b841d1bb
--- Merging r26197 into '.':
|
11 years ago |
|
marco
|
1ce1c60582
r26190 | michael | 2013-12-06 16:55:26 +0100 (Fri, 06 Dec 2013) | 1 line
|
11 years ago |
|
marco
|
c6d2ad41b7
* backported fix from bug #25314, index rebuilding of bufdataset.
|
11 years ago |
|
marco
|
8c5a8b1889
--- Merging r26189 into '.':
|
11 years ago |
|
marco
|
c6d7f89ddb
--- Merging r26008 into '.':
|
11 years ago |
|
marco
|
885deda91f
--- Merging r26069 into '.':
|
11 years ago |
|
marco
|
c68723e364
* patch from Reinier, fixing testsuite in fixes. Mantis #25420
|
11 years ago |
|
Jonas Maebe
|
90061402f3
* blocked r26146
|
11 years ago |
|
Jonas Maebe
|
96ef11475f
* manually merged r26132-r26133 from trunk (fixes cross-building)
|
11 years ago |
|
marco
|
f531820540
* updated warnings and versions in warnings relating to bookmark to clarify that change is postponed till 2.8.x
|
11 years ago |
|
marco
|
61e1174460
* Attempt to roll back last Hermes merges. TBT on 64-bit.
|
12 years ago |
|
marco
|
977283bae9
--- Merging r25984 into '.':
|
12 years ago |
|
marco
|
12966e78de
--- Merging r19569 into '.':
|
12 years ago |
|
marco
|
70976604b0
--- Merging r25981 into '.':
|
12 years ago |
|
marco
|
b74b811673
--- Reverse-merging r23700 into '.':
|
12 years ago |
|
marco
|
530271f953
--- Merging r25661 into '.':
|
12 years ago |
|
marco
|
9ca63a675f
--- Merging r25272 into '.':
|
12 years ago |
|
marco
|
7802532754
--- Merging r25815 into '.':
|
12 years ago |
|
marco
|
40c4f4ea90
--- Merging r23524 into '.':
|
12 years ago |
|
marco
|
e3f7d6126d
--- Merging r25403 into '.':
|
12 years ago |
|
marco
|
c2c73a8ad5
--- Merging r24186 into '.':
|
12 years ago |
|
marco
|
8a62993375
--- Merging r25392 into '.':
|
12 years ago |
|
marco
|
47f0518f56
--- Merging r25677 into '.':
|
12 years ago |
