10 Commits

Author SHA1 Message Date
Arthur Ice
a372ba3d39 Merge branch 'master' into char_to_string
Conflicts:
	common/dbcore.h
2013-05-26 10:07:44 -07:00
Arthur Ice
1b9004445d DoEscapeString changed to string for first argument.
RunQuery changed to string for first argument, removed len argument.
2013-05-25 21:22:08 -07:00
Arthur Ice
e5d4b35a32 Spelling fix in a comment. Nothing else. 2013-05-22 22:21:28 -07:00
Michael Cook
0fdfe025cb Remove 'using namespaces std' fixes #61 2013-05-22 16:17:19 -04: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
7ce6f4de0d More shared memory work + moved spdat from zone to common 2013-02-19 15:33:21 -08:00
badcaptain
a41874b6a7 Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc. 2013-02-18 00:50:19 -05:00
KimLS
da7347f76f svn -> git Migration 2013-02-16 16:14:39 -08:00