PDA

View Full Version : merge


biglad
07-26-2009, 04:26 AM
merge

src/bindings/scripts/VC90/90ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/bindings/scripts/VC90/90ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/bindings/scripts/CMakeLists.txt (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/bindings/scripts/CMakeLists.txt) (1 lines added, 0 lines removed)
src/bindings/scripts/VC80/80ScriptDev2.vcproj (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/bindings/scripts/VC80/80ScriptDev2.vcproj) (4 lines added, 0 lines removed)
src/game/Level1.cpp (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/game/Level1.cpp) (4 lines added, 1 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/game/Chat.cpp) (1 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/game/SpellEffects.cpp) (1 lines added, 1 lines removed)
src/bindings/scripts/ScriptMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/bindings/scripts/ScriptMgr.cpp) (2 lines added, 0 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/95b2c896c0a9/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)



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