biglad
02-15-2010, 02:51 PM
Merge
src/shared/SystemConfig.h.in (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/shared/SystemConfig.h.in) (0 lines added, 103 lines removed)
src/game/BattleGroundHandler.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGroundHandler.cpp) (145 lines added, 183 lines removed)
src/game/SharedDefines.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/SharedDefines.h) (1 lines added, 1 lines removed)
src/game/ChatHandler.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/ChatHandler.cpp) (59 lines added, 44 lines removed)
src/game/WorldSession.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/WorldSession.h) (1 lines added, 0 lines removed)
src/game/DBCfmt.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/DBCfmt.h) (1 lines added, 0 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGround.cpp) (36 lines added, 20 lines removed)
src/game/Spell.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Spell.cpp) (1 lines added, 1 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/trinitycore/trinitycore.conf.dist) (1 lines added, 1 lines removed)
src/game/DBCStructure.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/DBCStructure.h) (13 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Unit.cpp) (20 lines added, 21 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/shared/SystemConfig.h) (2 lines added, 2 lines removed)
src/game/BattleGroundMgr.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGroundMgr.cpp) (230 lines added, 184 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Player.cpp) (13 lines added, 20 lines removed)
More... (http://bitbucket.org/Azrael/mga-322a/changeset/6b59449c6b7d/)
src/shared/SystemConfig.h.in (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/shared/SystemConfig.h.in) (0 lines added, 103 lines removed)
src/game/BattleGroundHandler.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGroundHandler.cpp) (145 lines added, 183 lines removed)
src/game/SharedDefines.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/SharedDefines.h) (1 lines added, 1 lines removed)
src/game/ChatHandler.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/ChatHandler.cpp) (59 lines added, 44 lines removed)
src/game/WorldSession.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/WorldSession.h) (1 lines added, 0 lines removed)
src/game/DBCfmt.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/DBCfmt.h) (1 lines added, 0 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGround.cpp) (36 lines added, 20 lines removed)
src/game/Spell.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Spell.cpp) (1 lines added, 1 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/trinitycore/trinitycore.conf.dist) (1 lines added, 1 lines removed)
src/game/DBCStructure.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/DBCStructure.h) (13 lines added, 0 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Unit.cpp) (20 lines added, 21 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/shared/SystemConfig.h) (2 lines added, 2 lines removed)
src/game/BattleGroundMgr.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/BattleGroundMgr.cpp) (230 lines added, 184 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-322a/src/6b59449c6b7d/src/game/Player.cpp) (13 lines added, 20 lines removed)
More... (http://bitbucket.org/Azrael/mga-322a/changeset/6b59449c6b7d/)