PDA

View Full Version : Merge


biglad
01-19-2010, 08:51 AM
Merge

src/game/GameEventMgr.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/GameEventMgr.cpp) (0 lines added, 3 lines removed)
src/game/OutdoorPvPWG.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/OutdoorPvPWG.cpp) (4 lines added, 1 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/BattleGround.cpp) (0 lines added, 1 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/Unit.cpp) (0 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/SpellEffects.cpp) (0 lines added, 0 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-322a/src/b9cb09096a72/src/game/Player.cpp) (0 lines added, 0 lines removed)


More... (http://bitbucket.org/Azrael/mga-322a/changeset/b9cb09096a72/)