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

Merge commit 'origin/master' into 310 (at [7361], for resolve expected conflicts)

Browse source 
Conflicts:
	src/game/Spell.cpp
This commit is contained in:
VladimirMangos 2009-03-01 01:24:29 +03:00
commit 8c489f80dc
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7360"
#define REVISION_NR "7361"
#endif // __REVISION_NR_H__