Merge branch 'develop'

This commit is contained in:
Paulo Gustavo Veiga 2014-04-29 11:30:12 -03:00
commit 35a397c734

View File

@ -29,11 +29,9 @@ CREATE TABLE R_LABEL_MINDMAP (
ON DELETE CASCADE ON DELETE CASCADE
ON UPDATE NO ACTION ON UPDATE NO ACTION
) )
CHARACTER SET utf8;
ALTER TABLE `LABEL` ALTER TABLE `LABEL`
ADD COLUMN iconName VARCHAR(50) NOT NULL; ADD COLUMN iconName VARCHAR(50) NOT NULL;
UPDATE LABEL SET iconName = 'glyphicon glyphicon-tag'; UPDATE LABEL SET iconName = 'glyphicon glyphicon-tag';
CHARACTER SET utf8;