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

data/core/editor/brushes.cfg

@@ -60,7 +60,7 @@
     [relative]
         x=0
     [/relative]
-    name= _ "Hex Line SE-NW"
+    name= _ "Hex Line SW-NE"
 [/brush]
 
 # [brush]

projectfiles/CodeBlocks/wesnoth.cbp

@@ -37,6 +37,7 @@
 			<Add option="-Wno-strict-aliasing" />
 			<Add option="-Wno-missing-braces" />
 			<Add option="-DHAVE_PYTHON" />
+			<Add option="-DHAVE_LIBPNG" />
 			<Add option="-DUSE_GZIP" />
 			<Add option="-D_WIN32_WINDOWS" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
@@ -76,11 +77,14 @@
 			<Add library="libboost_bzip2-mgw45-mt-1_57.a" />
 			<Add library="libboost_filesystem-mgw45-mt-1_57.a" />
 			<Add library="libboost_locale-mgw45-mt-1_57.a" />
+			<Add library="libpng" />
 			<Add directory="./" />
 		</Linker>
 		<Unit filename="../../packaging/windows/wesnoth.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
+		<Unit filename="../../src/SDL_SavePNG/savepng.cpp" />
+		<Unit filename="../../src/SDL_SavePNG/savepng.h" />
 		<Unit filename="../../src/about.cpp" />
 		<Unit filename="../../src/about.hpp" />
 		<Unit filename="../../src/actions/attack.cpp" />
@@ -965,6 +969,8 @@
 		<Unit filename="../../src/replay_controller.hpp" />
 		<Unit filename="../../src/replay_helper.cpp" />
 		<Unit filename="../../src/replay_helper.hpp" />
+		<Unit filename="../../src/replay_recorder_base.cpp" />
+		<Unit filename="../../src/replay_recorder_base.hpp" />
 		<Unit filename="../../src/reports.cpp" />
 		<Unit filename="../../src/reports.hpp" />
 		<Unit filename="../../src/resources.cpp" />

projectfiles/VC9/wesnoth.vcproj

@@ -23684,6 +23684,14 @@
 			RelativePath="..\..\src\replay_controller.hpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\replay_recorder_base.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\replay_recorder_base.hpp"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\replay_helper.cpp"
 			>