PDA

View Full Version : Merge


biglad
01-10-2010, 07:31 AM
Merge

src/game/OutdoorPvPWG.cpp (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/OutdoorPvPWG.cpp) (1 lines added, 1 lines removed)
src/game/CMakeLists.txt (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/CMakeLists.txt) (307 lines added, 305 lines removed)
src/game/ChatHandler.cpp (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/ChatHandler.cpp) (5 lines added, 4 lines removed)
win/VC90/game.vcproj (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/win/VC90/game.vcproj) (1841 lines added, 1833 lines removed)
src/game/Chat.cpp (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/Chat.cpp) (1 lines added, 1 lines removed)
sql/FULL/world_scripts_full.sql (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/sql/FULL/world_scripts_full.sql) (10 lines added, 1 lines removed)
src/game/BattleGround.cpp (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/BattleGround.cpp) (10 lines added, 8 lines removed)
sql/world.sql (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/sql/world.sql) (0 lines added, 14 lines removed)
src/game/DBCStructure.h (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/DBCStructure.h) (1 lines added, 0 lines removed)
src/shared/SystemConfig.h (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/shared/SystemConfig.h) (1 lines added, 1 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-322a/src/15476f3a734c/src/game/Player.cpp) (242 lines added, 180 lines removed)


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