PDA

View Full Version : Merge


biglad
01-18-2010, 10:00 PM
Merge

sql/updates/7062_gossip_menu_option.sql (http://bitbucket.org/Azrael/mga-322a/src/7b592ca049fa/sql/updates/7062_gossip_menu_option.sql) (0 lines added, 17 lines removed)
sql/updates/7083_world_creature_template.sql (http://bitbucket.org/Azrael/mga-322a/src/7b592ca049fa/sql/updates/7083_world_creature_template.sql) (0 lines added, 5 lines removed)
src/game/Player.cpp (http://bitbucket.org/Azrael/mga-322a/src/7b592ca049fa/src/game/Player.cpp) (3 lines added, 21 lines removed)



More... (http://bitbucket.org/Azrael/mga-322a/changeset/7b592ca049fa/)