Tiger Wang 37140ae578 Merge branch 'master' into portals ... Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp		2014-07-18 20:10:51 +01:00
..
cmake-coverage	Maybe coverage working?	2014-05-10 05:03:36 -07:00
expat	Updated MSVC side of CMake files after recent changes.	2014-04-25 23:45:16 +02:00
inifile	Portal improvements and suggestions	2014-06-10 20:43:27 +01:00
jsoncpp	Fixed buffer overflow in JSON.	2014-06-04 10:47:12 +02:00
lua	Fixed lua compilation under MinGW.	2014-06-30 21:42:20 +02:00
luaexpat	Missed these CMakeLists.	2014-04-25 12:24:09 -07:00
luaproxy	LuaProxy compilation under MinGW.	2014-07-01 15:23:29 +02:00
polarssl@1ed82759c6	Monster fixes	2014-07-18 10:47:00 +01:00
sqlite	Proper sqlite dependency fix.	2014-07-01 08:01:39 +02:00
tolua++	Tolua driver: Fixed wrong indentation.	2014-07-13 17:07:55 +02:00
zlib	Missed these CMakeLists.	2014-04-25 12:24:09 -07:00
polarssl.cmake	Fixed OpenSSL programs and tests being generated when testing disabled.	2014-07-06 16:27:50 +01:00