mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-25 13:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/ObjectMgr.cpp
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2008-12-22 15:44:49 +03:00
commit 9fda3da212
10 changed files with 104 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shared/SystemConfig.h.in
View file

@ -27,7 +27,7 @@
#ifndef _VERSION
#if PLATFORM == PLATFORM_WINDOWS
# define _VERSION(REVD,REVT,REVN,REVH) "0.12.0-DEV" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
# define _VERSION(REVD,REVT,REVN,REVH) "0.12.1" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
#else
# define _VERSION(REVD,REVT,REVN,REVH) "@VERSION@" " (" REVD " " REVT " Revision " REVN " - " REVH ")"
#endif