Merge branch '310' of git://github.com/mangos/mangos into 310
commitdbd7421261c98e0646d9eb26bfcdff66b8ff6a7d
authorParadox <iamparadox@netscape.net>
Wed, 6 May 2009 11:10:22 +0000 (6 07:10 -0400)
committerParadox <iamparadox@netscape.net>
Wed, 6 May 2009 11:10:22 +0000 (6 07:10 -0400)
tree4a17c1b70d32de999323f03d91507ca77fbee93b
parentcd126db8f1a5f7c6f5ba22c122b4b98a7f5ba556
parentccd406e984f3f611ffd13dfe07a63960f139b3c6
Merge branch '310' of git://github.com/mangos/mangos into 310
src/game/Chat.cpp
src/game/Chat.h
src/game/Level3.cpp
src/game/Makefile.am
src/game/World.cpp
win/VC80/game.vcproj
win/VC90/game.vcproj