mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-21 12:05:29 +00:00
removed conflict markers and fixed style issues
This commit is contained in:
parent
a77a993a5c
commit
2c86f7396f
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user