Merge branch 'master' of github.com:wesnoth/wesnoth

wesnoth · Dec 23, 2014 · 1887936 · 1887936
2 parents 0397b0d + 5a8dddd
commit 1887936
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/changelog b/changelog
@@ -157,6 +157,8 @@ Version 1.13.0-dev:
    * Fix sound timings for drake fire animation macros
    * Assigned capitalized translatable names to Walking Corpse and Soulless
      variations (bug #22902).
+   * Hid alternate Great Wolf variation from help as it is identical to the
+     default variation stats-wise.
  * User interface:
    * Added a context menu option for command mode.
    * Added a Classic theme which restores the 1.10 UI.

diff --git a/data/core/units/monsters/Wolf_Great.cfg b/data/core/units/monsters/Wolf_Great.cfg
@@ -67,6 +67,7 @@
     [variation]
         variation_name=red
         inherit=yes
+        hide_help=yes
         image="units/monsters/wolf-great+red.png"
 
         [movement_anim]