pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into random

Browse Source 
Conflicts:
	zone/command.cpp
	zone/merc.cpp
This commit is contained in:
Michael Cook (mackal)
2014-12-02 14:05:55 -05:00
parent faaebc2806 525eb518f6
commit dc0eb0f6b5
14 changed files with 550 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/version.h
+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 9058
#define CURRENT_BINARY_DATABASE_VERSION 9059
#define COMPILE_DATE __DATE__
#define COMPILE_TIME __TIME__
#ifndef WIN32