[Exult-cvs-logs] [exult/exult] 237d59: Desk_schedule: face table properly

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/exult/exult
  Commit: 237d5970143fdc77bcf5bfa06a431f0b589fe5ac
      https://github.com/exult/exult/commit/237d5970143fdc77bcf5bfa06a431f0b589fe5ac
  Author: jeff <jef...@gm...>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M schedule.cc

  Log Message:
  -----------
  Desk_schedule: face table properly


  Commit: cd2022b993f9f821551fe557cc7e51e25ba1a7f9
      https://github.com/exult/exult/commit/cd2022b993f9f821551fe557cc7e51e25ba1a7f9
  Author: jeff <jef...@gm...>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M actions.cc
    M cheat_screen.cc
    M files/utils.cc
    M gamemap.h
    M gamemgr/bggame.cc
    M gamemgr/sigame.cc
    M gumps/Gump_manager.cc
    M pathfinder/path.cc
    M schedule.cc
    M schedule.h
    M sdl-compat.h

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

Conflicts:
	schedule.cc


  Commit: e939dad37dfc67489756ebcfa797c8adf85ab23d
      https://github.com/exult/exult/commit/e939dad37dfc67489756ebcfa797c8adf85ab23d
  Author: jeff <jef...@gm...>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M schedule.cc

  Log Message:
  -----------
  Fixed conflict


Compare: https://github.com/exult/exult/compare/cdfc92004269...e939dad37dfc