Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jonathan Puckey 2012-04-25 19:48:44 +02:00
commit 11136af244

View file

@ -108,7 +108,7 @@ var TextItem = this.TextItem = Item.extend(/** @lends TextItem# */{
setCharacterStyle: function(style) {
this.setStyle(style);
},
}
/**
* The paragraph style of the text item.