Author: ai0867
Date: Wed Apr 21 22:38:57 2010
New Revision: 42208
URL: http://svn.gna.org/viewcvs/wesnoth?rev=42208&view=rev
Log:
Merge trunk up to r42207
Added:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/kai_krellis2.png
- copied unchanged from r42207,
trunk/data/campaigns/Dead_Water/images/portraits/kai_krellis2.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis2.png
- copied unchanged from r42207,
trunk/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis2.png
branches/fendrin_pathfind_and_editor/data/multiplayer/maps/2p_Elensefar_Courtyard.map
- copied unchanged from r42207,
trunk/data/multiplayer/maps/2p_Elensefar_Courtyard.map
branches/fendrin_pathfind_and_editor/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
- copied unchanged from r42207,
trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
Modified:
branches/fendrin_pathfind_and_editor/changelog
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/fist-merman.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/tail-merman.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/kai_krellis.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/child_king.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/soldier_king.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/warrior_king.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/young_king.png
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Soldier_King.cfg
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Warrior_King.cfg
branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
branches/fendrin_pathfind_and_editor/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
branches/fendrin_pathfind_and_editor/data/core/about.cfg
branches/fendrin_pathfind_and_editor/data/core/macros/animation-utils.cfg
branches/fendrin_pathfind_and_editor/data/core/units/goblins/Rouser.cfg
branches/fendrin_pathfind_and_editor/data/core/units/orcs/Leader.cfg
branches/fendrin_pathfind_and_editor/data/core/units/orcs/Ruler.cfg
branches/fendrin_pathfind_and_editor/data/core/units/orcs/Sovereign.cfg
branches/fendrin_pathfind_and_editor/data/core/units/undead/Skele_Death_Knight.cfg
branches/fendrin_pathfind_and_editor/doc/man/wesnoth.6
branches/fendrin_pathfind_and_editor/players_changelog
branches/fendrin_pathfind_and_editor/po/wesnoth-did/gl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-did/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-did/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-dm/gl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-dm/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-dm/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-dw/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-editor/gl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-httt/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-l/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-lib/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-low/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-low/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-manpages/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-multiplayer/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-nr/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-nr/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-sof/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-sotbe/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-thot/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-tutorial/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-units/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/pl.po
branches/fendrin_pathfind_and_editor/po/wesnoth/gl.po
branches/fendrin_pathfind_and_editor/po/wesnoth/ja.po
branches/fendrin_pathfind_and_editor/po/wesnoth/pl.po
branches/fendrin_pathfind_and_editor/src/game.cpp
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/fendrin_pathfind_and_editor/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/changelog?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/fist-merman.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/fist-merman.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/tail-merman.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/attacks/tail-merman.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/kai_krellis.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/kai_krellis.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/portraits/transparent/kai_krellis.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/child_king.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/child_king.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/soldier_king.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/soldier_king.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/warrior_king.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/warrior_king.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/young_king.png
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/images/units/merfolk/young_king.png?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Soldier_King.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Soldier_King.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Warrior_King.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Dead_Water/units/Warrior_King.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/data/core/about.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/about.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/core/macros/animation-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/macros/animation-utils.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/core/units/goblins/Rouser.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/units/goblins/Rouser.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/data/core/units/orcs/Leader.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/units/orcs/Leader.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/data/core/units/orcs/Ruler.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/units/orcs/Ruler.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/core/units/orcs/Sovereign.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/units/orcs/Sovereign.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified:
branches/fendrin_pathfind_and_editor/data/core/units/undead/Skele_Death_Knight.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/data/core/units/undead/Skele_Death_Knight.cfg?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/doc/man/wesnoth.6
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/doc/man/wesnoth.6?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/players_changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/players_changelog?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-did/gl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-did/gl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-did/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-did/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-did/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-did/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-dm/gl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-dm/gl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-dm/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-dm/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-dm/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-dm/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-dw/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-dw/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-editor/gl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-editor/gl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-httt/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-httt/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-l/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-l/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-lib/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-lib/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-low/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-low/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-low/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-low/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-manpages/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-manpages/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-multiplayer/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-multiplayer/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-nr/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-nr/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-nr/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-nr/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-sof/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-sof/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-sotbe/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-sotbe/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-thot/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-thot/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-tutorial/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-tutorial/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-units/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-units/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth-utbs/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth/gl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth/gl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth/ja.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth/ja.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/po/wesnoth/pl.po
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/po/wesnoth/pl.po?rev=42208&r1=42207&r2=42208&view=diff
Modified: branches/fendrin_pathfind_and_editor/src/game.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/fendrin_pathfind_and_editor/src/game.cpp?rev=42208&r1=42207&r2=42208&view=diff
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
