Merge branch 'master' into 303

Browse source

Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Chat.h
	src/game/Player.h
	src/game/World.h
	src/game/debugcmds.cpp

...

This commit is contained in:

tomrus88 2008-12-16 07:30:23 +03:00

parent 053d60a3f7 98281cc389

commit 71b1065c8b

50 changed files with 3499 additions and 976 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1430

src/game/BattleGroundMgr.cpp

View file

File diff suppressed because it is too large Load diff