 marco
|
a4ee31bd2f
--- Merging r34462 into '.':
|
8 years ago |
|
marco
|
5921bde887
--- Merging r35878 into '.':
|
8 years ago |
|
marco
|
3415e4f16e
--- Merging r36481 into '.':
|
8 years ago |
 nickysn
|
34489b2730
* adapted merge of r36461, so compilation works again
|
8 years ago |
|
marco
|
f9a1b21224
--- Merging r36461 into '.':
|
8 years ago |
|
marco
|
da0edf83d0
--- Merging r35421 into '.':
|
8 years ago |
|
marco
|
61181705e0
--- Merging r36405 into '.':
|
8 years ago |
|
marco
|
749108cb22
--- Merging r36412 into '.':
|
8 years ago |
 pierre
|
daee8c2fdd
Fix problem with GNU make 4.X
|
8 years ago |
|
marco
|
4bf19fd098
--- Merging r36341 into '.':
|
8 years ago |
|
marco
|
fb0e43122c
--- Merging r36383 into '.':
|
8 years ago |
|
marco
|
32124fd64c
--- Merging r35545 into '.':
|
8 years ago |
|
marco
|
ae0e1255bb
--- Merging r36343 into '.':
|
8 years ago |
 michael
|
d34dcf1c60
* Merge revisions r36355,r36356,r36357,r36358 from trunk:
|
8 years ago |
|
marco
|
f0e37b88ed
--- Merging r36315 into '.':
|
8 years ago |
|
marco
|
406fb857d9
* copy syserrorformat trunk version to fixes. (manual merge)
|
8 years ago |
|
michael
|
438c2dfbd9
* Merge revision r36212 from trunk:
|
8 years ago |
|
pierre
|
063793363f
Fix dosbox_wrapper executable location from commits 32614,32625,6256 and 32628
|
8 years ago |
|
pierre
|
4c0ea44208
adapted commit rev 32474: avoid range check error in geasizeint method.
|
8 years ago |
|
pierre
|
06c159ab17
Update msgtct.inc because copyright year 2017
|
8 years ago |
|
marco
|
f2100ed6f8
--- Merging r35475 into '.':
|
8 years ago |
|
marco
|
78372b17c3
--- Merging r35466 into '.':
|
8 years ago |
|
marco
|
c361439bbd
--- Merging r35520 into '.':
|
8 years ago |
|
marco
|
45a1db6730
--- Merging r36060 into '.':
|
8 years ago |
|
marco
|
11ffed7f79
--- Merging r35632 into '.':
|
8 years ago |
|
marco
|
0bf0a6988f
--- Merging r34485 into '.':
|
8 years ago |
|
marco
|
1d62a37c74
--- Merging r34840 into '.':
|
8 years ago |
|
marco
|
dd73b45660
--- Merging r35594 into '.':
|
8 years ago |
|
marco
|
69c6e91e89
--- Merging r34871 into '.':
|
8 years ago |
|
marco
|
f10fc20a8c
--- Merging r33038 into '.':
|
8 years ago |
