Tiger Wang bfa8aaf41b Merge branch 'master' into portals ...

Conflicts:
	src/ClientHandle.cpp
	src/Entities/Player.cpp
	src/Entities/Player.h
	src/Protocol/Protocol125.cpp
	src/Protocol/Protocol17x.cpp

2014-06-10 20:51:22 +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

for compiliers other than msvc we need to tell lua that its building as a dll

2014-05-28 15:59:59 +01:00

luaexpat

Missed these CMakeLists.

2014-04-25 12:24:09 -07:00

md5

Missed these CMakeLists.

2014-04-25 12:24:09 -07:00

polarssl @ 1ed82759c6

Merged change to enable testing to be disabled

2014-05-01 09:53:43 -07:00

sqlite

Cmake system name not System name

2014-05-28 21:39:28 +01:00

tolua++

Fixed debugging code in tolua++ driver script.

2014-06-09 20:00:17 +02:00

zlib

Missed these CMakeLists.

2014-04-25 12:24:09 -07:00

polarssl.cmake

Fixed polarssl programs included

2014-05-01 12:05:11 -07:00