fix last commit

This commit is contained in:
Bär Halberkamp 2016-07-31 13:22:24 -04:00
parent fd1a776997
commit 51ebabae4d

View file

@ -284,11 +284,7 @@ Version 1.13.5:
* Added wesnoth.special_locations
* [lua] tags now also support the [args] subtag outside events.
* added lua_function= attribute in location filters
<<<<<<< HEAD
* Added on_event.lua which is an eaiser to use wrapper for
=======
* Added on_event.lua which is an eaiser to use wrapper for
>>>>>>> Change attack sounds for short swords
wesnoth.game_events.on_event
* Multiplayer:
* Hornshark Island: simplified multiplayer faction determination