Author: esr
Date: Sat Apr 18 23:43:35 2009
New Revision: 35027
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35027&view=rev
Log:
Consolidate two adjacent talk scenarios.
Added:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_dark_sky_over_weldyn.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_the_portal_of_doom.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
(contents, props changed)
- copied, changed from r35026,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_face_of_the_enemy.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_epilogue.cfg
(contents, props changed)
- copied, changed from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_dark_sky_over_weldyn.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg
Modified:
trunk/data/campaigns/Delfadors_Memoirs/TODO
trunk/data/campaigns/Delfadors_Memoirs/_main.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/15_save_the_king.cfg
trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/data/campaigns/Delfadors_Memoirs/TODO
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/TODO?rev=35027&r1=35026&r2=35027&view=diff
Modified: trunk/data/campaigns/Delfadors_Memoirs/_main.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/_main.cfg?rev=35027&r1=35026&r2=35027&view=diff
Modified: trunk/data/campaigns/Delfadors_Memoirs/scenarios/15_save_the_king.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/15_save_the_king.cfg?rev=35027&r1=35026&r2=35027&view=diff
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_dark_sky_over_weldyn.cfg
(from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_dark_sky_over_weldyn.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_dark_sky_over_weldyn.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg&r1=35025&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/16_in_the_kings_council.cfg?rev=35026&view=auto
Copied: trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg
(from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg&r1=35025&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_dark_sky_over_weldyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_dark_sky_over_weldyn.cfg?rev=35026&view=auto
Removed: trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_a_new_ally.cfg?rev=35026&view=auto
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_the_portal_of_doom.cfg
(from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_the_portal_of_doom.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/18_the_portal_of_doom.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg&r1=35025&r2=35027&rev=35027&view=diff
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg
(from r35026,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_showdown_in_the_northern_swamp.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg&r1=35026&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/19_the_portal_of_doom.cfg?rev=35026&view=auto
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg (from
r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_prince_of_wesnoth.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg&r1=35025&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/20_showdown_in_the_northern_swamp.cfg?rev=35026&view=auto
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg
(from r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_clash_at_the_manor.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg&r1=35025&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/21_prince_of_wesnoth.cfg?rev=35026&view=auto
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_clash_at_the_manor.cfg?rev=35026&view=auto
Copied:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_face_of_the_enemy.cfg (from
r35025,
trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_face_of_the_enemy.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/22_face_of_the_enemy.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg&r1=35025&r2=35027&rev=35027&view=diff
Copied: trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_epilogue.cfg (from
r35025, trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_epilogue.cfg?p2=trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_epilogue.cfg&p1=trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg&r1=35025&r2=35027&rev=35027&view=diff
Removed:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/23_face_of_the_enemy.cfg?rev=35026&view=auto
Removed: trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/24_epilogue.cfg?rev=35026&view=auto
Modified: trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/utils/sides.cfg?rev=35027&r1=35026&r2=35027&view=diff
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
