anonymous/cuberite - A lightweight, fast and extensible game server for Minecraft

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed SQLiteCpp downgrade	Howaner	2014-09-23	1	-0/+0
\|
*	Merge branch 'master' into EntityCustomName	Howaner	2014-09-23	1	-0/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Updated SQLiteCpp.	madmaxoft	2014-09-17	1	-0/+0
\| \| \| \| \| \| \| \|	Our changes have made it into upstream, updating to sync with upstream master.
\| *	Fixed submodules' downgrade from the previous PR merge.	Mattes D	2014-09-07	1	-0/+0
\|/
*	Added SQLiteCpp library.	madmaxoft	2014-07-28	1	-0/+0
	This provides C++ wrappers for SQLite, making it safer to use in the C++ environment.