Merge

[biglad]

Merge

src/game/BattleGroundIC.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/BattleGroundIC.cpp) (2 lines added, 2 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/BattleGround.cpp) (5 lines added, 3 lines removed)
src/game/BattleGroundIC.h (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/BattleGroundIC.h) (1 lines added, 1 lines removed)
src/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/scripts/CMakeLists.txt) (10 lines added, 4 lines removed)
src/game/Map.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/Map.cpp) (25 lines added, 7 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/sql/world.sql) (8 lines added, 2 lines removed)
src/game/CMakeLists.txt (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/CMakeLists.txt) (10 lines added, 2 lines removed)
src/game/BattleGroundSA.h (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/BattleGroundSA.h) (1 lines added, 1 lines removed)
src/game/Creature.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/Creature.cpp) (1 lines added, 2 lines removed)
src/game/BattleGroundSA.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/BattleGroundSA.cpp) (2 lines added, 2 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/4857e743b74d/src/game/Player.cpp) (8 lines added, 0 lines removed)


More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/4857e743b74d)