Fixed build after merge.
commite4cc9f200eb9a8076681af6305440d1b9059e144
authorVladimirMangos <vladimir@getmangos.com>
Tue, 9 Dec 2008 05:28:42 +0000 (9 08:28 +0300)
committerVladimirMangos <vladimir@getmangos.com>
Tue, 9 Dec 2008 05:28:42 +0000 (9 08:28 +0300)
treed5262b1ba8af325db62b41f482f52cad639a3cde
parentcb4e14cbefaab281429c46f5e303feec6ca7a605
Fixed build after merge.
src/game/SpellAuras.cpp
src/game/SpellMgr.cpp
src/game/Traveller.h