Merge branch 'master' into 303

Conflicts:
	src/game/ObjectMgr.cpp
This commit is contained in:
tomrus88 2008-11-22 17:23:44 +03:00
commit 6224f95fd5
15 changed files with 167 additions and 93 deletions

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6838"
#define REVISION_NR "6841"
#endif // __REVISION_NR_H__