Merge branch 'master' into 310

Conflicts:
	src/game/World.cpp
	src/game/WorldSession.h
	src/game/WorldSocket.cpp
This commit is contained in:
tomrus88 2009-03-21 17:02:15 +03:00
commit e5d9ea8cb0
2 changed files with 0 additions and 16 deletions

View file

@ -137,17 +137,9 @@
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.cpp">
</File>
<File
RelativePath="..\..\src\game\AchievementMgr.h">
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp">
</File>
<File
RelativePath="..\..\src\game\AddonHandler.h">
</File>
<File
RelativePath="..\..\src\game\ArenaTeamHandler.cpp">

View file

@ -362,14 +362,6 @@
RelativePath="..\..\src\game\AchievementMgr.h"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.cpp"
>
</File>
<File
RelativePath="..\..\src\game\AddonHandler.h"
>
</File>
<File
RelativePath="..\..\src\game\ArenaTeamHandler.cpp"
>