In the dialog layout code, fixed the button padding.

There was no check if the "text_and_image_height"
variable was equal to zero. If so, the buttons were
placed -6 units too high.
Modified the changelog and added myself to the credits.
remove replay viewer text label

This label didn't seem to contribute much of anything, and it
caused big problems for translators because we don't have
dynamically resizing text labels, and that would have provoked
intractable layout problems anyways, so we decide just to remove
it and rely on the tooltips / media controller icons on the buttons
to tell the user what is going on.

See also discussion here:
http://forums.wesnoth.org/viewtopic.php?f=9&t=24598&start=120#p575851
multiplayer_connect_engine.cpp: dereference pointer

This fixes building with boost-1.56 and thus
https://gna.org/bugs/?22643.
update changelog
Merge branch 'master' of https://github.com/wesnoth/wesnoth
Fix bug #22650: nontranslatable strings displayed in tooltips for terrain icons

The string for the tooltip of the terrain icon was the
underlying terrain id (same string as the one used to
retreive the image). "gamemap::get_terrain_string"
method is used as string for the tooltip in order to have
a correct translatable string.
dont delete a side from carryover if it came back to life 

This especialy fixes the scenario "Stolen Gold" from "Northern Rebirth" (http://gna.org/bugs/?22601)

this commit ports e0ec8c32b22c95412925bc163eeaca6ffa96d1ab from 1.12
Fix bug #22745: choose_track function crashes the game in certain cases

In certain cases "current_track_index" can be greater than
"current_track_list.size()" thus causing an "index out of
range" error.
Merge pull request #291 from LovCAPONE/ChoseTrackBug

Fix bug #22745: choose_track function crashes the game in certain cases
Merge branch 'NontransStrTooltipTerrainIcon' of https://github.com/LovCAPONE/wesnoth into LovCAPONE-NontransStrTooltipTerrainIcon

Conflicts:
	changelog
Merge branch 'LovCAPONE-NontransStrTooltipTerrainIcon'
Fix incorrect image reference in the ToD help topic (bug #22537)
Merge remote-tracking branch 'LovCAPONE/TopButtonStatsCutOff'

Conflicts:
	changelog
Merge branch 'master' of https://github.com/wesnoth/wesnoth
gui2/tcampaign_settings: Make labels conform to our label case convention

Checkbox and standalone labels like this should be in Sentence case, not
Title Case.
Add cropped image_icon for Grand Knight

So that it fits the unit box in the sidebar.
Detect empty subnamespaces in [clear_global_variable] (bug #21093)

Once they become empty, there is no config left behind to clear, which
causes persist_context::get_node() to consistently return NULL.
Previously, this caused a straight null pointer dereference; in order to
guard against undefined behavior, an assertion check was added to
properly terminate execution first.

Neither solution is correct. My understanding of this unwiedly mess is
that persist_file_context::clear_var() recurses outwards from the
original target pruning empty subnamespaces. At some point we are going
to run out of things to delete, so just quit the recursion at that point
and return to the caller and everything should be fine (or so it was in
my test runs with different subnamespace layouts).

(In general, the fact that this code completely lacks documentation of
any sort and has several non-obvious layers to it is a *really* bad sign
for maintainability of this feature in the future. Furthermore, this is
not the first time we have had problems with glogal variables nested in
subnamespaces -- see bug #20385, which was arguably more disastrous in
practice.)
Fix misplaced changelog entry for bug #20332
Fix changelog entry for bug #22537 missing its number