proller
|
52fe7de610
|
Merge remote-tracking branch 'minetest/master'
|
2015-11-08 00:23:15 +03:00 |
|
proller
|
c2a0c32b3e
|
Merge commit '93fcab9'
Conflicts:
.travis.yml
CMakeLists.txt
README.txt
build/android/Makefile
cmake/Modules/FindCURL.cmake
cmake/Modules/FindGettextLib.cmake
cmake/Modules/FindOpenGLES2.cmake
cmake/Modules/GenerateVersion.cmake
misc/winresource.rc
src/CMakeLists.txt
src/client/clientlauncher.cpp
src/cmake_config.h.in
src/config.h
src/debug.cpp
src/emerge.cpp
src/game.cpp
src/guiEngine.cpp
src/httpfetch.cpp
src/jthread/CMakeLists.txt
src/lua/CMakeLists.txt
src/main.cpp
src/server.cpp
|
2015-03-28 17:44:09 +03:00 |
|
proller
|
1515e219f2
|
Merge remote-tracking branch 'minetest/master'
Conflicts:
misc/freeminer.desktop
po/es/minetest.po
|
2015-01-21 00:43:38 +03:00 |
|
proller
|
a9894d51c1
|
Merge remote-tracking branch 'minetest/master'
|
2014-10-23 00:00:35 +04:00 |
|
proller
|
c19467e909
|
install works
|
2013-12-04 00:49:06 +04:00 |
|