PDA

View Full Version : Merge


biglad
02-04-2010, 06:03 PM
Merge

src/game/SpellAuraEffects.cpp (http://bitbucket.org/Azrael/mga-322a/src/988368640813/src/game/SpellAuraEffects.cpp) (49 lines added, 38 lines removed)
src/game/SpellMgr.cpp (http://bitbucket.org/Azrael/mga-322a/src/988368640813/src/game/SpellMgr.cpp) (6 lines added, 4 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-322a/src/988368640813/sql/FULL/world_scripts_full.sql) (2 lines added, 1 lines removed)
sql/updates/7293_world_creature_template.sql (http://bitbucket.org/Azrael/mga-322a/src/988368640813/sql/updates/7293_world_creature_template.sql) (0 lines added, 1 lines removed)


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