Masy98 9cdb9b6262 Merge branch 'master' into blocks ...

Conflicts:
	MCServer/crafting.txt

2014-09-06 22:06:40 +02: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

Added cIniFile::HasValue() function.

2014-09-03 23:00:16 +02: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

SQLiteCpp @ 27b9d11181

Updated SQLiteCpp.

2014-09-03 22:37:50 +02:00

tolua++

Quick fix for a preprocessor error with clang on OS X

2014-09-02 23:21:34 -07: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