mirror of
https://github.com/mangosfour/server.git
synced 2025-12-12 19:37:03 +00:00
Merge branch 'master' into 310
Conflicts: src/game/World.cpp src/game/WorldSession.h src/game/WorldSocket.cpp
This commit is contained in:
commit
e5d9ea8cb0
2 changed files with 0 additions and 16 deletions
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue