PDA

View Full Version : Merge


biglad
06-02-2010, 06:00 PM
Merge

sql/updates/8111_realmd_account_access.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8111_realmd_account_access.sql) (0 lines added, 1 lines removed)
sql/updates/8049_world_npc_vendor.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8049_world_npc_vendor.sql) (0 lines added, 2 lines removed)
sql/updates/8020_characters_item_refund_instance.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8020_characters_item_refund_instance.sql) (0 lines added, 2 lines removed)
sql/updates/8049_world_trinity_strings.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8049_world_trinity_strings.sql) (0 lines added, 3 lines removed)
sql/updates/8054_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8054_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/7973_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7973_world_spell_proc_event.sql) (0 lines added, 2 lines removed)
sql/updates/8136_03_characters_group_instance.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8136_03_characters_group_instance.sql) (0 lines added, 8 lines removed)
sql/updates/8089_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8089_world_script_texts.sql) (0 lines added, 12 lines removed)
sql/updates/8089_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8089_world_script_waypoint.sql) (0 lines added, 32 lines removed)
sql/updates/8052_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8052_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8062_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8062_world_script_texts.sql) (0 lines added, 9 lines removed)
sql/updates/8156_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8156_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/7930_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7930_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/7928_world_quest_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7928_world_quest_template.sql) (0 lines added, 1 lines removed)
sql/updates/7982_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7982_world_spell_proc_event.sql) (0 lines added, 4 lines removed)
sql/updates/8054_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8054_world_script_waypoint.sql) (0 lines added, 28 lines removed)
sql/updates/8058_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8058_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8088_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8088_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/7981_world_season_linked_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7981_world_season_linked_event.sql) (0 lines added, 7 lines removed)
sql/updates/8044_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8044_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8140_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8140_world_spell_proc_event.sql) (0 lines added, 2 lines removed)
sql/updates/8048_characters_item_refund_instance.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8048_characters_item_refund_instance.sql) (0 lines added, 1 lines removed)
sql/updates/8179_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8179_world_scriptname.sql) (0 lines added, 2 lines removed)
sql/updates/8060_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8060_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8051_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8051_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8057_world_game_event_npc_vendor.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8057_world_game_event_npc_vendor.sql) (0 lines added, 2 lines removed)
sql/updates/8051_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8051_world_script_texts.sql) (0 lines added, 5 lines removed)
sql/updates/8044_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8044_world_script_texts.sql) (0 lines added, 30 lines removed)
sql/updates/8062_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8062_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8041_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8041_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/8062_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8062_world_script_waypoint.sql) (0 lines added, 16 lines removed)
sql/updates/7974_characters_character_aura.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7974_characters_character_aura.sql) (0 lines added, 2 lines removed)
sql/updates/8057_world_npc_vendor.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8057_world_npc_vendor.sql) (0 lines added, 2 lines removed)
sql/updates/8109_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8109_world_spell_proc_event.sql) (0 lines added, 6 lines removed)
sql/updates/8052_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8052_world_script_texts.sql) (0 lines added, 4 lines removed)
sql/updates/8060_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8060_world_script_waypoint.sql) (0 lines added, 18 lines removed)
sql/updates/8052_world_script_waypoint.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8052_world_script_waypoint.sql) (0 lines added, 29 lines removed)
sql/updates/8089_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8089_world_scriptname.sql) (0 lines added, 2 lines removed)
sql/updates/8044_world_script_waypoints.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8044_world_script_waypoints.sql) (0 lines added, 29 lines removed)
sql/updates/8136_02_characters_group_member.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8136_02_characters_group_member.sql) (0 lines added, 8 lines removed)
sql/updates/8004_world_spell_proc_event.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8004_world_spell_proc_event.sql) (0 lines added, 5 lines removed)
sql/updates/8006_world_quest_template.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8006_world_quest_template.sql) (0 lines added, 1 lines removed)
sql/updates/8116_characters_groups.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8116_characters_groups.sql) (0 lines added, 2 lines removed)
sql/updates/8122_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8122_world_scriptname.sql) (0 lines added, 17 lines removed)
sql/updates/8179_world_script_texts.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8179_world_script_texts.sql) (0 lines added, 5 lines removed)
sql/updates/8136_01_characters_groups.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8136_01_characters_groups.sql) (0 lines added, 5 lines removed)
sql/updates/8063_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8063_world_scriptname.sql) (0 lines added, 2 lines removed)
sql/updates/8073_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/8073_world_scriptname.sql) (0 lines added, 1 lines removed)
sql/updates/7988_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7988_world_scriptname.sql) (0 lines added, 6 lines removed)
sql/updates/7963_world_scriptname.sql (http://bitbucket.org/Azrael/mga-wow-core/src/133f0f53508d/sql/updates/7963_world_scriptname.sql) (0 lines added, 1 lines removed)



More... (http://bitbucket.org/Azrael/mga-wow-core/changeset/133f0f53508d)