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

Merge commit 'origin/master' into 320

Browse source 
Conflicts:
	src/game/ArenaTeam.cpp
This commit is contained in:
tomrus88 2009-07-29 15:17:37 +04:00
commit f90f3dd987
9 changed files with 234 additions and 199 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 "8266"
#define REVISION_NR "8273"
#endif // __REVISION_NR_H__

2
src/shared/vmap/VMapManager.cpp
View file

@ -444,7 +444,7 @@ namespace VMAP
//=========================================================
/**
get height or INVALID_HEIGHT if to hight was calculated
get height or INVALID_HEIGHT if to height was calculated
*/
//int gGetHeightCounter = 0;