]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
projects / dragonfireclient.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccd4c50 273bfee)
Merge branch 'master' of https://github.com/minetest/minetest
authorElias Fleckenstein <eliasfleckenstein@web.de>
Wed, 18 May 2022 14:00:53 +0000 (16:00 +0200)
committerElias Fleckenstein <eliasfleckenstein@web.de>
Wed, 18 May 2022 14:00:53 +0000 (16:00 +0200)
1  2 
src/gui/guiKeyChangeMenu.cpp patch | diff1 | diff2 | blob | history
src/unittest/test.cpp patch | diff1 | diff2 | blob | history

diff --cc src/gui/guiKeyChangeMenu.cpp
Simple merge
diff --cc src/unittest/test.cpp
Simple merge
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.