4b38e077cf
Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h |
||
---|---|---|
.. | ||
cmake-coverage | ||
expat | ||
inifile | ||
jsoncpp | ||
lua | ||
luaexpat | ||
luaproxy | ||
polarssl@1ed82759c6 | ||
sqlite | ||
SQLiteCpp@203c2fb68b | ||
tolua++ | ||
zlib | ||
polarssl.cmake |