Merge branch 'master' into 303

Conflicts:
	contrib/extractor/System.cpp
	src/game/MovementHandler.cpp
	src/game/Object.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/game/Spell.cpp
	src/game/Unit.cpp
	src/game/Unit.h
	src/game/WorldSession.cpp
	src/game/debugcmds.cpp
This commit is contained in:
tomrus88 2008-12-09 14:57:32 +03:00
commit b036c2b4ea

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "6888"
#define REVISION_NR "6889"
#endif // __REVISION_NR_H__