shadowm@nanacore:~/src/wesnoth-git$ git pull
The authenticity of host 'git.code.sf.net (216.34.181.155)' can't be established.
RSA key fingerprint is 86:7b:1b:12:85:35:8a:b7:98:b6:d2:97:5e:96:58:1d.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'git.code.sf.net,216.34.181.155' (RSA) to the list of known hosts.
remote: Counting objects: 40552, done.
remote: Compressing objects: 100% (7540/7540), done.
remote: Total 15502 (delta 11790), reused 11149 (delta 7869)
Receiving objects: 100% (15502/15502), 44.70 MiB | 348 KiB/s, done.
Resolving deltas: 100% (11790/11790), completed with 7142 local objects.
From ssh://git.code.sf.net/p/wesnoth/code
   2561c5b..1741464  master     -> origin/master
 * [new branch]      1.0        -> origin/1.0
 * [new branch]      1.10       -> origin/1.10
 * [new branch]      1.2        -> origin/1.2
 * [new branch]      1.4        -> origin/1.4
 * [new branch]      1.6        -> origin/1.6
 * [new branch]      1.8        -> origin/1.8
 * [new branch]      BRANCH_vendor_gettext -> origin/BRANCH_vendor_gettext
 * [new branch]      asio_wesnothd -> origin/asio_wesnothd
 * [new branch]      branch_gettext1 -> origin/branch_gettext1
 * [new branch]      formula-ai -> origin/formula-ai
 * [new branch]      gameplay_refactoring -> origin/gameplay_refactoring
 * [new branch]      gp2x       -> origin/gp2x
 * [new branch]      mordante_terrain -> origin/mordante_terrain
 * [new branch]      mp_registration -> origin/mp_registration
 * [new branch]      new_addon_server -> origin/new_addon_server
 * [new branch]      ogl        -> origin/ogl
 * [new branch]      terrain-layer -> origin/terrain-layer
 * [new branch]      water_animation -> origin/water_animation
 * [new branch]      wesnoth-gl -> origin/wesnoth-gl
 * [new branch]      wesnoth-python -> origin/wesnoth-python
 * [new branch]      xan        -> origin/xan
Updating 2561c5b..1741464
Fast-forward
 .gitignore                                                                     |    4 +
 data/campaigns/Heir_To_The_Throne/utils/bigmap.cfg                             |  414 ++++++++++++++++++++--------------------
 data/campaigns/Sceptre_of_Fire/utils/bigmap.cfg                                |  871 ++++++++++++++++++++++++++++++++++++++++++------------------------------------------
 data/campaigns/Son_Of_The_Black_Eye/utils/bigmap.cfg                           | 1550 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
 data/campaigns/The_South_Guard/utils/bigmap.cfg                                |  268 +++++++++++++-------------
 data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg |   10 +-
 data/core/encyclopedia/geography.cfg                                           |    2 +-
 data/core/terrain-graphics/editor.cfg                                          |    6 +-
 data/themes/editor.cfg                                                         |    4 +
 data/tools/wesnoth/wmltools.py                                                 |    2 +-
 misc/fortunes/wesnoth                                                          |   22 +++
 players_changelog                                                              |    2 +-
 src/editor/palette/editor_palettes.cpp                                         |   18 +-
 src/editor/palette/empty_palette.hpp                                           |   49 +++--
 src/editor/palette/palette_manager.cpp                                         |    9 +-
 src/editor/toolkit/editor_toolkit.cpp                                          |   16 +-
 16 files changed, 1643 insertions(+), 1604 deletions(-)