Arthur Ice
529408fca0
LoadDatabase converted to QueryDatabase
2014-08-18 14:45:54 -07:00
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
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00