Merge branch 'master' into 303

Conflicts:
	src/game/MovementHandler.cpp
This commit is contained in:
tomrus88 2008-12-13 23:16:44 +03:00
commit 4f55ef857a
7 changed files with 41 additions and 16 deletions

View file

@ -66,8 +66,8 @@ enum LoginResult
// we need to stick to 1 version or half of the stuff will work for someone
// others will not and opposite
// will only support WoW and WoW:TBC 3.0.3 client build 9155, 9174, 9183, 9328...
// will only support WoW and WoW:TBC 3.0.3 client build 9155, 9174, 9183, 9355...
#define EXPECTED_MANGOS_CLIENT_BUILD {9155, 9174, 9183, 9328, 0}
#define EXPECTED_MANGOS_CLIENT_BUILD {9155, 9174, 9183, 9355, 0}
#endif