biglad
07-23-2009, 02:25 PM
merge
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/World.cpp) (0 lines added, 3 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Chat.cpp) (0 lines added, 1 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/BattleGround.cpp) (1 lines added, 0 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Chat.h) (0 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/SpellEffects.cpp) (39 lines added, 0 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp) (2 lines added, 65 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Player.cpp) (2 lines added, 6 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/f984b9e2841f/)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/World.cpp) (0 lines added, 3 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Chat.cpp) (0 lines added, 1 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/BattleGround.cpp) (1 lines added, 0 lines removed)
src/game/Chat.h (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Chat.h) (0 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/SpellEffects.cpp) (39 lines added, 0 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp) (2 lines added, 65 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/f984b9e2841f/src/game/Player.cpp) (2 lines added, 6 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/f984b9e2841f/)