From: Paul Wisbey <p.wisbey@samsung.com>
Date: Tue, 1 Nov 2016 11:50:43 +0000 (-0700)
Subject: Merge "Update json style files with the new 'fontStyle' format." into devel/master
X-Git-Tag: dali_1.2.13~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=0cf88cf7443709f0f090f1666042e1fddd6eb550

Merge "Update json style files with the new 'fontStyle' format." into devel/master
---

0cf88cf7443709f0f090f1666042e1fddd6eb550