Merge conflicts abound and now are fixed

This commit is contained in:
KimLS
2015-07-02 20:12:51 -07:00
67 changed files with 24488 additions and 5020 deletions
+1 -1
View File
@@ -30,7 +30,7 @@
Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/
#define CURRENT_BINARY_DATABASE_VERSION 9085
#define CURRENT_BINARY_DATABASE_VERSION 9086
#define COMPILE_DATE __DATE__
#define COMPILE_TIME __TIME__
#ifndef WIN32