Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

This commit is contained in:
Vincent-Michael
2014-04-25 08:42:40 +02:00
10 changed files with 19746 additions and 115 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,8 @@
--
DELETE FROM `gossip_menu` WHERE `entry`=8725 AND `text_id`=11030;
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
(8725, 11030); -- 23093
DELETE FROM `gossip_menu_option` WHERE `menu_id`=8725 AND `id`=0;
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `box_coded`, `box_money`, `box_text`) VALUES
(8725, 0, 0, 'I am an envoy of Balthas. He has sent me to collect a flawless arcane essence.', 0, 0, ''); -- 23093

View File

@@ -0,0 +1,8 @@
--
DELETE FROM `gossip_menu` WHERE `entry`=10318 AND `text_id`=14324;
INSERT INTO `gossip_menu` (`entry`, `text_id`) VALUES
(10318, 14324); -- 33238
DELETE FROM `gossip_menu_option` WHERE `menu_id`=10318 AND `id`=7;
INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `box_coded`, `box_money`, `box_text`) VALUES
(10318, 7, 0, 'Stormwind Champion''s Pennant', 0, 0, ''); -- 33238