no warning as error
Merge branch 'master' of git://github.com/wesnoth/wesnoth-old
boost system
Merge branch 'master' of git://github.com/wesnoth/wesnoth-old

Conflicts:
	CMakeLists.txt
Merge branch 'master' of git://github.com/wesnoth/wesnoth-old
Needed because of https://svn.boost.org/trac/boost/ticket/7364 for c++11
compilations and a boost version >~1.53
Merge branch 'master' of git://github.com/wesnoth/wesnoth
undo
add exception handlers for "game::error" in playcampaign.cpp

I also add one for mapgen_exception, but this doesn't make so much
difference. It seems to be a big problem that we don't catch
game::error anywhere, I observed a similar bug being caused by
game::error being thrown directly by a button when it couldn't
find its image. The report was that it caused the game to crash
to desktop immediately (I think it was caught only in void main.)
fixup exception handler for replays

For some reason I had apparently set it up to skip writing errors
to stderr unless it was a unit test...
add game::error handler to game_launcher.cpp, also mapgen errors

Put the same handlers I added to playcampaign also for
game_launcher. It can't be good that we weren't catching
game::error anywhere...
button ctor throws game::error when it can't find its image

This partially reverts an earlier commit
28fe7e44

instead of changing the exception type to game::game_error,
(which I assume is meant for in-game errors?), we go back to
game::error which is now handled properly in playcampaign.cpp
and game_launcher.cpp

Tested that this does not reintroduce bug 22611.
don't catch game::error in playcampaign.cpp
use standard loggers instead of std::cerr
Merge pull request #304 from cbeck88/fixup_exception_handlers

Fixup exception handlers
Upgrade bundled Lua library to version 5.2.3 (bug #22893)

This fixes several bugs in the Lua interpreter:

 * http://www.lua.org/bugs.html#5.2.1
 * http://www.lua.org/bugs.html#5.2.2
 * http://www.lua.org/bugs.html#5.2.3

Released on December 2013, this is the latest stable version as of the
writing of this patch.

This commit consists of a merge of the full diff between versions 5.2.0
and 5.2.3, with paths fixed (.c vs. .cpp). I only had to manually
reconcile the following two commits:

 * f5e673e6443220c57e40cea31d430870b4f73925
   Replace all kinds of the constant pi representations.
 * 299a29f99a84767731dbadd540712d1a37e5e10d
   Fix an off-by-one past-the-end buffer read in lua
Update changelog
capitalize xBRZ instances in src/help.cpp
move SDL_SavePNG to the SDL compilation group, on cmake also

This ports over this commit for scons:
ff857d1d2b6dc97e886774115499847c2256804b
Merge branch 'master' of git://github.com/wesnoth/wesnoth

Conflicts:
	src/game_events/action_wml.cpp