merge

[biglad]

merge

src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (0 lines added, 12 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (0 lines added, 12 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/src/bindings/scripts/CMakeLists.txt) (0 lines added, 2 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/src/game/SpellEffects.cpp) (8 lines added, 0 lines removed)
sql/updates/4572_script_texts.sql (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/sql/updates/4572_script_texts.sql) (0 lines added, 0 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/ba261ce5e785/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)



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