Merge branch 'master' of git://github.com/wesnoth/wesnoth

data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg

@@ -486,39 +486,6 @@
         [/event]
     [/event]
 
-    [event]
-        name=side turn
-        first_time_only=no
-
-        [if]
-            [variable]
-                name=undead_spotted
-                not_equals=yes
-            [/variable]
-
-            [have_unit]
-                race=undead
-            [/have_unit]
-
-            [then]
-                [scroll_to_unit]
-                    race=undead
-                [/scroll_to_unit]
-
-                [message]
-                    speaker=Urza Nalmath
-                    message= _ "Now the Guard will feel the wrath of my new friends! It is time for the dead to wage war! Rise, warriors!"
-                [/message]
-
-                [scroll_to_unit]
-                    race=undead
-                [/scroll_to_unit]
-
-                {VARIABLE undead_spotted yes}
-            [/then]
-        [/if]
-    [/event]
-
     # Pillaging and burning the villages near Westin
 
     [event]

players_changelog

@@ -5,7 +5,7 @@ changelog: https://github.com/wesnoth/wesnoth/blob/master/changelog
 Version 1.13.0-dev:
  * Campaigns:
    * The Hammer of Thursagan:
-     * Rebalanced scenarios 'Invaders', Mages and Drakes' and 'Fear'.
+     * Rebalanced scenarios 'Invaders', 'Mages and Drakes' and 'Fear'.
 
  * Language and i18n:
    * Updated translations: Czech, French, German, Greek, Hungarian, Italian,

projectfiles/CodeBlocks/wesnoth.cbp

@@ -538,6 +538,7 @@
 		<Unit filename="..\..\src\gui\dialogs\campaign_selection.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\chat_log.cpp" />
 		<Unit filename="..\..\src\gui\dialogs\chat_log.hpp" />
+		<Unit filename="..\..\src\gui\dialogs\core_selection.cpp" />
 		<Unit filename="..\..\src\gui\dialogs\data_manage.cpp" />
 		<Unit filename="..\..\src\gui\dialogs\data_manage.hpp" />
 		<Unit filename="..\..\src\gui\dialogs\debug_clock.cpp" />