[Commits] [wesnoth/wesnoth] 694a2c: for some compilers, assert != terminate... fixup m...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 694a2c4fd1124ceb9b7dead519212e79f88b0e7d
      https://github.com/wesnoth/wesnoth/commit/694a2c4fd1124ceb9b7dead519212e79f88b0e7d
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M src/make_enum.hpp

  Log Message:
  -----------
  for some compilers, assert != terminate... fixup make_enum


  Commit: f4708f52366bfba3b4482ac10ebb715c23580ec1
      https://github.com/wesnoth/wesnoth/commit/f4708f52366bfba3b4482ac10ebb715c23580ec1
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-05-26 (Mon, 26 May 2014)

  Changed paths:
    M src/playmp_controller.cpp

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/022f78a3ae92...f4708f52366b