Merge branch 'devel/master' into devel/new_mesh 81/42381/1 devel/new_mesh
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:09:53 +0000 (15:09 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:09:53 +0000 (15:09 +0100)
commitd9c164e4530e354cd14dc4a1a658070ba55e99b8
tree993d93407121e475807bbf2f9a59fc9f2b8fb20b
parent124f76d218896a586aff231f7d7da351df56d22b
parent1263805136b9938e348fd4e519e64fa9bad20f94
Merge branch 'devel/master' into devel/new_mesh

Conflicts:
automated-tests/src/dali-toolkit/CMakeLists.txt

Change-Id: Id952401475048d0f19f9ab8757695175ec46056e
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
build/tizen/dali-toolkit/Makefile.am
dali-toolkit/internal/controls/popup/popup-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/file.list
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h