biglad
03-18-2010, 09:24 AM
Merge
src/game/Level2.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Level2.cpp) (5 lines added, 5 lines removed)
src/game/BattleGroundHandler.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/BattleGroundHandler.cpp) (1 lines added, 1 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/SpellAuraEffects.cpp) (0 lines added, 17 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/sql/FULL/world_scripts_full.sql) (3 lines added, 0 lines removed)
src/game/Map.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Map.cpp) (4 lines added, 1 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/sql/world.sql) (6 lines added, 4 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Unit.cpp) (46 lines added, 33 lines removed)
src/scripts/northrend/icecrown.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/scripts/northrend/icecrown.cpp) (45 lines added, 0 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/00ce0c094920/)
src/game/Level2.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Level2.cpp) (5 lines added, 5 lines removed)
src/game/BattleGroundHandler.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/BattleGroundHandler.cpp) (1 lines added, 1 lines removed)
src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/SpellAuraEffects.cpp) (0 lines added, 17 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/sql/FULL/world_scripts_full.sql) (3 lines added, 0 lines removed)
src/game/Map.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Map.cpp) (4 lines added, 1 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/sql/world.sql) (6 lines added, 4 lines removed)
src/game/Unit.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/game/Unit.cpp) (46 lines added, 33 lines removed)
src/scripts/northrend/icecrown.cpp (http://bitbucket.org/Azrael/mga-wow-core/src/00ce0c094920/src/scripts/northrend/icecrown.cpp) (45 lines added, 0 lines removed)
More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/00ce0c094920/)