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
..
2013-12-04 15:34:24 +04:00
2013-12-06 21:21:13 +04:00
2015-03-21 18:44:22 +03:00
2015-03-28 17:44:09 +03:00