merge

[biglad]

merge

sql/updates/4489_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/sql/updates/4489_world_spell_proc_event.sql) (0 lines added, 1 lines removed)
src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/bindings/scripts/ScriptMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/bindings/scripts/ScriptMgr.cpp) (6 lines added, 0 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/bindings/scripts/CMakeLists.txt) (1 lines added, 0 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/game/SpellEffects.cpp) (17 lines added, 4 lines removed)
sql/updates/4572_script_texts.sql (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/sql/updates/4572_script_texts.sql) (0 lines added, 0 lines removed)
sql/updates/4527_world_spell_script_target.sql (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/sql/updates/4527_world_spell_script_target.sql) (0 lines added, 4 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/12f2248672e1/src/game/Player.cpp) (0 lines added, 27 lines removed)


More... (http://bitbucket.org/Azrael/mgacore2/changeset/12f2248672e1/)