From: Nick Holland Date: Thu, 11 Dec 2014 15:02:57 +0000 (+0000) Subject: [dali_1.0.21] Merge branch 'tizen' X-Git-Tag: dali_1.0.22~3^2~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=8ca28807aa182b4f3e9f2abc41d45162ed08ad99;hp=c4e366261947882968de0a13e51a3dd0d2f34e41 [dali_1.0.21] Merge branch 'tizen' Change-Id: I4cf0e47c2c831e78c51e4d3e75b804e6d08cc4ef ---