CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <[EMAIL PROTECTED]> 05/05/01 17:48:19
Modified files:
. : changelog
Log message:
Fix changelog mess.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.639&tr2=1.640&r1=text&r2=text
Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.639 wesnoth/changelog:1.640
--- wesnoth/changelog:1.639 Sun May 1 15:46:37 2005
+++ wesnoth/changelog Sun May 1 17:48:19 2005
@@ -1,9 +1,4 @@
CVS HEAD:
-<<<<<<< changelog
- * campaign improvements:
- * fixed bug in Unexpected Appearance (EI) where Dacyn is not recalled
- * Updates to Drowned Plains (EI) that will make it more balanced
-=======
* user interface improvements:
* starting position in editor now starts at player 1 (#10625)
* fixed female units not appearing in help (broken since 0.9.0)
@@ -13,13 +8,13 @@
* preserve order of unit traits so no more quick,resilient but 33 vs 34 HP
* campaign improvements:
* Eastern Invasion:
- * fix Dacyn not being [recall]-ed in Unexpected Appearance (#10619)
- * Fix killing enemies in wrong order not resulting in a victory in
- Northern Outpost (#12922)
+ * fixed Dacyn not being [recall]-ed in Unexpected Appearance (#10619)
+ * fixed killing enemies in wrong order not resulting in a victory in
+ Northern Outpost (#12922)
* new map and scenario modification for Drowned Plains
- * Changes to Skeletal Dragon resistances for Drowned Plains
+ * changed Skeletal Dragon resistances for Drowned Plains
* Heir to the Throne:
- * fix thieves not appearing in Siege of Elensefar (forum thread 5719)
+ * fixed thieves not appearing in Siege of Elensefar (forum thread 5719)
* Son of the Black Eye:
* shamans are no longer recallable in (#11932)
* killing enemy leader in Siege of Barag Gor is no longer a win
@@ -35,7 +30,6 @@
Drake Fire
* new attack animations for Halberdier
* fixed several image files being referred to by wrong name
->>>>>>> 1.627
* language and i18n:
* language fixes and polishing (English)
* clarified Necrophage self-leveling in unit description (#10714)
