*Merge with Trinity 793.

--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-01-06 12:15:18 -06:00
commit 2b21f0e730
21 files changed
+200 -95

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
DELETE FROM trinity_string where entry IN (10056, 10057);
INSERT INTO trinity_string (entry, content_default) VALUES
(10056, 'You must be a member of the Horde to enter the Hall of Legends.'),
(10057, 'You must be a member of the Alliance to enter the Champion\'s Hall.');
+4
View File
@@ -0,0 +1,4 @@
delete from command where name in ('gobject tempadd', 'npc tempadd');
insert into command (name, security, help) values
('gobject tempadd','2','Adds a temporary gameobject that is not saved to DB.'),
('npc tempadd','2','Adds temporary NPC, not saved to database.');
+1
View File
@@ -0,0 +1 @@
ALTER TABLE eventai_texts DROP COLUMN emote;