[Commits] [wesnoth/wesnoth] ff287a: Fix error from b6c88df9e7da58921cd00813b7d99e41352...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: ff287a48552c1a6d56dc420db620dd342940db13
      https://github.com/wesnoth/wesnoth/commit/ff287a48552c1a6d56dc420db620dd342940db13
  Author: Gregory A Lundberg <gregory_lundberg at gmx.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M src/wesmage/filter.cpp

  Log Message:
  -----------
  Fix error from b6c88df9e7da58921cd00813b7d99e41352bb03f

Parameter name 'filter' masked struct name 'filter'


  Commit: 37a29ad5572099e91187877b84b0c87d270639cd
      https://github.com/wesnoth/wesnoth/commit/37a29ad5572099e91187877b84b0c87d270639cd
  Author: Celtic Minstrel <CelticMinstrel at users.noreply.github.com>
  Date:   2016-11-11 (Fri, 11 Nov 2016)

  Changed paths:
    M src/wesmage/filter.cpp

  Log Message:
  -----------
  Merge pull request #873 from GregoryLundberg/GL_fix_name_conflict

Fix error from b6c88df9e7da58921cd00813b7d99e41352bb03f


Compare: https://github.com/wesnoth/wesnoth/compare/4fffa3205eaa...37a29ad55720