Arthur Ice f1a487f606 Merge branch 'master' into StringFormatting. ...

Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp

2013-05-19 18:56:21 -07:00

..

CMakeLists.txt

Merge conflicts

2013-05-15 13:22:46 -07:00

database.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

database.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

lfguild.cpp

Merge branch 'master' into StringFormatting.

2013-05-19 18:56:21 -07:00

lfguild.h

svn -> git Migration

2013-02-16 16:14:39 -08:00

queryserv.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

queryservconfig.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

queryservconfig.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

worldserver.cpp

Change space indentation to tabs

2013-05-09 11:37:51 -04:00

worldserver.h

Change space indentation to tabs

2013-05-09 11:37:51 -04:00