From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Tue, 5 Jan 2016 18:33:19 +0000 (-0800)
Subject: Merge changes I000b9684,I1a6a0f46 into devel/master
X-Git-Tag: dali_1.1.16~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=a5fd3c7972dade609f0a66a3c4fca27d33ee7454

Merge changes I000b9684,I1a6a0f46 into devel/master

* changes:
  (ImageView) Reinstated RESOURCE_URL property for source compatibility with release
  Restored control-depth-index-ranges.h to released version but using devel values internally
---

a5fd3c7972dade609f0a66a3c4fca27d33ee7454