From 518f6fe9b636776ece701b97f5eaf3da9154a0f8 Mon Sep 17 00:00:00 2001
From: "Ignacio R. Morelle" <shadowm@wesnoth.org>
Date: Thu, 4 Jun 2015 23:08:03 -0300
Subject: [PATCH] Add changelog entries for last commit

---
 changelog         | 2 ++
 players_changelog | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/changelog b/changelog
index b2f51a10d543..8086601ab54c 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ Version 1.12.2+dev:
      a unit attack definition
    * Micro AIs: add a warning and avoid crash when a non-existing side is used
      in the [micro_ai] tag
+ * Editor:
+   * Fixed stack corruption bug in the Side Setup dialog.
  * Language and i18n:
    * Updated translations: Scottish Gaelic
  * User interface:
diff --git a/players_changelog b/players_changelog
index 5645d0a7c927..d61c53877438 100644
--- a/players_changelog
+++ b/players_changelog
@@ -3,6 +3,9 @@ changes may be omitted). For a complete list of changes, see the main
 changelog: https://github.com/wesnoth/wesnoth/blob/1.12/changelog
 
 Version 1.12.2+dev:
+ * Editor:
+   * Fixed memory corruption bug in the Side Setup dialog.
+
  * Language and i18n:
    * Updated translations: Scottish Gaelic.