Merge "Changed Atlas manager to use Dali::Texture instead of Dali::Atlas" into devel...
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 8 Jul 2016 13:55:50 +0000 (06:55 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 8 Jul 2016 13:55:50 +0000 (06:55 -0700)

Trivial merge