From: Francisco Santos <f1.santos@samsung.com>
Date: Thu, 4 Jun 2015 16:31:19 +0000 (+0100)
Subject: Merge branch 'tizen' into devel/new_mesh
X-Git-Tag: dali_1.0.47~3^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F40733%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'tizen' into devel/new_mesh

Change-Id: I38c536fc0ba528d76aefd1809b76aac840f291ed
---

586b671d0659b8a95a40bf92ccc4259f6ee7dd63