[wesnoth-commits] [wesnoth/wesnoth] fd74c0: fixup double rendering caused by bad conflict reso...

[GitHub]

  Branch: refs/heads/accelerated_rendering
  Home:   https://github.com/wesnoth/wesnoth
  Commit: fd74c0db9639a2c3c4db5de06e89ef39e3fe277e
      https://github.com/wesnoth/wesnoth/commit/fd74c0db9639a2c3c4db5de06e89ef39e3fe277e
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2018-03-14 (Wed, 14 Mar 2018)

  Changed paths:
    M src/video.cpp

  Log Message:
  -----------
  fixup double rendering caused by bad conflict resolution