]> git.lizzy.rs Git - dragonfireclient.git/commit
Merge branch 'master' into master 8/head
authorElias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com>
Wed, 4 Nov 2020 13:40:00 +0000 (14:40 +0100)
committerGitHub <noreply@github.com>
Wed, 4 Nov 2020 13:40:00 +0000 (14:40 +0100)
commitfc8c8f01ca15912b1db176fec473bcfb0333032f
tree08182e80b69d5352f81c6827d3caa4efe13e6f14
parent61e2b3a33190d5979bc2e36f9734cebd18465f26
parenta7dc1135e94bde5f8c3385d54388563eaffe7553
Merge branch 'master' into master
builtin/settingtypes.txt
src/defaultsettings.cpp
src/gui/cheatMenu.cpp
src/gui/cheatMenu.h