biglad
08-06-2009, 05:30 AM
merge
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/SpellAuras.cpp) (5 lines added, 1 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/AchievementMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/AchievementMgr.cpp) (1 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/SpellEffects.cpp) (29 lines added, 5 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/Player.cpp) (59 lines added, 111 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/99f82659f413/)
src/game/SpellAuras.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/SpellAuras.cpp) (5 lines added, 1 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/AchievementMgr.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/AchievementMgr.cpp) (1 lines added, 1 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/SpellEffects.cpp) (29 lines added, 5 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mgacore2/src/99f82659f413/src/game/Player.cpp) (59 lines added, 111 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/99f82659f413/)