summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* --- Merging r36006 into '.':marco2017-06-1926-1229/+7639
* --- Merging r34462 into '.':marco2017-06-191-6/+15
* --- Merging r35878 into '.':marco2017-06-191-2/+2
* --- Merging r36481 into '.':marco2017-06-141-13/+13
* * adapted merge of r36461, so compilation works againnickysn2017-06-101-3/+3
* --- Merging r36461 into '.':marco2017-06-102-11/+17
* --- Merging r35421 into '.':marco2017-06-041-3/+3
* --- Merging r36405 into '.':marco2017-06-046-1429/+2433
* --- Merging r36412 into '.':marco2017-06-041-0/+13
* Fix problem with GNU make 4.Xpierre2017-06-021-1/+5
* --- Merging r36341 into '.':marco2017-06-011-11/+14
* --- Merging r36383 into '.':marco2017-06-011-4/+6
* --- Merging r35545 into '.':marco2017-05-301-4/+6
* --- Merging r36343 into '.':marco2017-05-281-1/+1
* * Merge revisions r36355,r36356,r36357,r36358 from trunk:michael2017-05-287-3/+87
* --- Merging r36315 into '.':marco2017-05-241-1/+1
* * copy syserrorformat trunk version to fixes. (manual merge)marco2017-05-221-13/+17
* * Merge revision r36212 from trunk:michael2017-05-202-1/+18
* Fix dosbox_wrapper executable location from commits 32614,32625,6256 and 32628pierre2017-05-072-1/+14
* adapted commit rev 32474: avoid range check error in geasizeint method.pierre2017-05-071-1/+1
* Update msgtct.inc because copyright year 2017pierre2017-05-061-1/+1
* --- Merging r35475 into '.':marco2017-05-042-4/+8
* --- Merging r35466 into '.':marco2017-05-041-2/+2
* --- Merging r35520 into '.':marco2017-05-041-0/+4
* --- Merging r36060 into '.':marco2017-05-021-1/+1
* --- Merging r35632 into '.':marco2017-05-021-0/+1
* --- Merging r34485 into '.':marco2017-05-011-93/+105
* --- Merging r34840 into '.':marco2017-05-013-71/+496
* --- Merging r35594 into '.':marco2017-05-015-29/+538
* --- Merging r34871 into '.':marco2017-05-014-0/+87
* --- Merging r33038 into '.':marco2017-05-012-6/+4
* --- Merging r35548 into '.':marco2017-05-011-1/+1
* --- Merging r33039 into '.':marco2017-05-0118-36/+36
* * patch from Lacak to merge 34962-34963 manually (can't merge directlymarco2017-04-291-27/+50
* --- Merging r32032 into '.':marco2017-04-292-15/+18
* --- Merging r31855 into '.':marco2017-04-291-1/+1
* --- Merging r35607 into '.':marco2017-04-291-12/+13
* --- Merging r34492 into '.':marco2017-04-297-99/+211
* --- Merging r35498 into '.':marco2017-04-291-0/+7
* --- Merging r33998 into '.':marco2017-04-2915-1221/+4820
* --- Merging r35752 into '.':marco2017-04-291-8/+8
* --- Merging r34618 into '.':marco2017-04-292-85/+416
* --- Merging r35130 into '.':marco2017-04-2815-19/+19
* revs: 34146,34465,34692,34693marco2017-04-283-11/+29
* --- Merging r30083 into '.':marco2017-04-287-6/+16
* --- Merging r35877 into '.':marco2017-04-282-9/+10
* --- Merging r34727 into '.':marco2017-04-283-30/+42
* --- Merging r33772 into '.':marco2017-04-283-12/+23
* --- Merging r34244 into '.':marco2017-04-289-37/+73
* --- Merging r33254 into '.':marco2017-04-288-154/+313