Merge remote-tracking branch 'origin/master' into 4.3.4

This commit is contained in:
DDuarte
2014-09-13 13:55:17 +01:00
59 changed files with 1305 additions and 500 deletions

View File

@@ -626,28 +626,6 @@ CREATE TABLE `creature_text` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `db_script_string`
--
DROP TABLE IF EXISTS `db_script_string`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `db_script_string` (
`entry` int(10) unsigned NOT NULL DEFAULT '0',
`content_default` text NOT NULL,
`content_loc1` text,
`content_loc2` text,
`content_loc3` text,
`content_loc4` text,
`content_loc5` text,
`content_loc6` text,
`content_loc7` text,
`content_loc8` text,
PRIMARY KEY (`entry`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Table structure for table `disables`
--