Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04: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
j883376
f51f6e00c4
Add install paths to CMakeLists
2013-05-15 17:04:08 -04:00
KimLS
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
Michael Cook
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04: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
SecretsOTheP
cabf8631d4
Fixed mercenary memleaks in AI_Start and Unsuspend.
2013-03-20 04:00:08 -04:00
KimLS
ef9498b03a
Got rid of rules global (ugh) and gonna start work on items loading next
2013-02-20 15:35:46 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00