Add and wire new Merman Spearman portrait, update changelogs, portrait credits.

changelog

@@ -1,3 +1,7 @@
+Version 1.7.5 +SVN:
+ * Graphics:
+   * New portrait for Merman Spearman
+
 Version 1.7.5:
  * Campaigns:
    * Legend of Wesmere

data/core/images/portraits/ARTISTS

@@ -52,6 +52,7 @@ Merfolk
     Hoplite
     Triton
     Hunter
+    Spearman
 Others:
     Troll Whelp
     Troll

data/core/units/merfolk/Javelineer.cfg

@@ -5,7 +5,7 @@
     race=merman
     image="units/merfolk/javelineer.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
-    profile=portraits/merfolk/hunter.png
+    profile=portraits/merfolk/spearman.png
     hitpoints=55
     movement_type=swimmer
     movement=6
@@ -20,6 +20,18 @@
     description= _ "Those mermen who master the art of the javelin can become nearly as effective as an archer - though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the mermen more than makes up for this when facing foes who cannot swim."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/javelineer.png" "units/merfolk/javelineer.png" mermen-hit.wav }
+    [portrait]
+        size=400
+        side="left"
+        mirror="false"
+        image="portraits/merfolk/transparent/spearman.png"
+    [/portrait]
+    [portrait]
+        size=400
+        side="right"
+        mirror="true"
+        image="portraits/merfolk/transparent/spearman.png"
+    [/portrait]
     [attack]
         name=spear
         description=_"spear"

data/core/units/merfolk/Spearman.cfg

@@ -5,7 +5,7 @@
     race=merman
     image="units/merfolk/spearman.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
-    profile=portraits/merfolk/hunter.png
+    profile=portraits/merfolk/spearman.png
     hitpoints=40
     movement_type=swimmer
     movement=6
@@ -19,6 +19,18 @@
     description= _ "Archery is little favored by the mermen, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/spearman.png" "units/merfolk/spearman.png" mermen-hit.wav }
+    [portrait]
+        size=400
+        side="left"
+        mirror="false"
+        image="portraits/merfolk/transparent/spearman.png"
+    [/portrait]
+    [portrait]
+        size=400
+        side="right"
+        mirror="true"
+        image="portraits/merfolk/transparent/spearman.png"
+    [/portrait]
     [attack]
         name=spear
         description=_"spear"

players_changelog

@@ -1,6 +1,9 @@
 This is meant to be a concise list of player-visible changes (very minor
 changes may be omitted). For a complete list of changes, see the main
 changelog: http://svn.gna.org/viewcvs/*checkout*/wesnoth/trunk/changelog
+Version 1.7.5 +SVN:
+ * Graphics:
+   * New portrait for Merman Spearman
 
 Version 1.7.5:
  * Graphics: