Merge branch 'v2-stable' into beta

This commit is contained in:
Andre Lorbach 2009-03-20 17:31:28 +01:00
commit f8258ecafd

View File

@ -11,8 +11,8 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
DROP TABLE IF EXISTS `logcon_config`; DROP TABLE IF EXISTS `logcon_config`;
CREATE TABLE `logcon_config` ( CREATE TABLE `logcon_config` (
`propname` varchar(32) NOT NULL, `propname` varchar(32) NOT NULL,
`propvalue` varchar(255) NOT NULL, `propvalue` varchar(255) NULL,
`propvalue_text` text NOT NULL, `propvalue_text` text NULL,
`is_global` tinyint(1) NOT NULL, `is_global` tinyint(1) NOT NULL,
`userid` int(11) default NULL, `userid` int(11) default NULL,
`groupid` int(11) default NULL `groupid` int(11) default NULL