Merge branch 'r10-maint'
commit03e8fe9fb872944ccc27d125859e92c730ae55d5
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 1 Jul 2010 18:22:30 +0000 (1 21:22 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Thu, 1 Jul 2010 18:22:30 +0000 (1 21:22 +0300)
tree4f5fe35815b4d4edee4f31e73627a67156bafa8d
parentfa3a05bbcd04d4c893cb43c0ac52af259c36e659
parent401fdf45fc49bac795fd69b7981433720046dea7
Merge branch 'r10-maint'

Merge some DJGPP fixes from r10-maint branch.

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8
org/jpc/emulator/memory/codeblock/optimised/Virtual8086ModeUBlock.java