]> git.lizzy.rs Git - dragonfireclient.git/commit
Fix upstream merge issues
authorElias Fleckenstein <eliasfleckenstein@web.de>
Tue, 7 Jun 2022 01:31:06 +0000 (03:31 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Tue, 7 Jun 2022 01:31:06 +0000 (03:31 +0200)
commit296cce39d33bf6dab2b41504321f18c2574f164b
treed06e4a7788e2e976f02df4d618e3a6338ec5847e
parentb11c0a6721cd884d78b38b63797dfdb933004e03
Fix upstream merge issues
src/client/clientmap.cpp
src/client/game.cpp
src/client/game.h