[Commits] [wesnoth/wesnoth] f9bf98: Merge branch 'master' of https://github.com/wesnot...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f9bf98293b2b01919ae4776a7f41571a4d126fa8
      https://github.com/wesnoth/wesnoth/commit/f9bf98293b2b01919ae4776a7f41571a4d126fa8
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M utils/mp-server/update_server

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


  Commit: 6e6766663cd51e658097876826b4fdb57f5e69d6
      https://github.com/wesnoth/wesnoth/commit/6e6766663cd51e658097876826b4fdb57f5e69d6
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M src/tests/test_unit_map.cpp

  Log Message:
  -----------
  fix whitespace


  Commit: ba8d643a3c02f1dbfdfd7fc1e16d8a0287989d33
      https://github.com/wesnoth/wesnoth/commit/ba8d643a3c02f1dbfdfd7fc1e16d8a0287989d33
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

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


Compare: https://github.com/wesnoth/wesnoth/compare/ae0265fabf95...ba8d643a3c02