]> git.lizzy.rs Git - dragonfireclient.git/commit
projects / dragonfireclient.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c66664 21b7a27)
Merge remote-tracking branch 'erlehmann/master'
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Fri, 22 Jul 2011 05:48:22 +0000 (07:48 +0200)
commit02653573d27efa13d8590504a8d30866fe5b093e
tree0894fb522ed13d77e6b104183fb6f3a62b6d9741tree | snapshot
parent5c66664aef852c01c8ec8f79856ba081cf01446bcommit | diff
parent21b7a272c4558795f5e8b7d8af859d51dd616d31commit | diff
Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
src/CMakeLists.txt
src/CMakeLists.txt diff1 | diff2 | blob | history
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.