removed conflict markers and fixed style issues

This commit is contained in:
Gunter Labes 2011-12-18 00:15:47 +00:00
parent a77a993a5c
commit 2c86f7396f

View File

@ -13,19 +13,17 @@ Version 1.9.12+svn:
* Fixes showing of larger portraits on smaller screens
(bugs #17961 and #18686).
* Unit changes and balancing:
* Changed the Lancer's and the Deathblade's AMLA requirements to conform to the current AMLA standards
* Changed the Lancer's and the Deathblade's AMLA requirements to conform to
the current AMLA standards.
* Whiteboard:
* Display turn numbers on multi-turn planned moves
* Display turn numbers on multi-turn planned moves.
* Fix attacks not finishing but still being transmitted over the network when
executing all actions.
* Miscellaneous and bug fixes:
* Forward ported a new version of multiplayer chat log history dialog
* Fixed bug #19188: Turn dialog always speaks of Konrad in tutorial
<<<<<<< HEAD
* Forward ported a new version of multiplayer chat log history dialog.
* Fixed bug #19188: Turn dialog always speaks of Konrad in tutorial.
* Added NativeClient port.
=======
* Optimized screen update (zooming, ToD change) and framerate
>>>>>>> update changelog
* Optimized screen update (zooming, ToD change) and framerate.
Version 1.9.12:
* Language and i18n: