From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 3 Sep 2020 11:58:53 +0000 (+0000)
Subject: Merge "Moved Gesture::State and -::Type to gesture-enumerations.h." into devel/master
X-Git-Tag: dali_1.9.28~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=346c047a487db6b75118680e39ce249a6cdaa8db;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge "Moved Gesture::State and -::Type to gesture-enumerations.h." into devel/master
---

346c047a487db6b75118680e39ce249a6cdaa8db
diff --cc examples/gestures/gesture-example.cpp
index bd32658,4bab310..d04c63e
mode 100644,100755..100644
--- a/examples/gestures/gesture-example.cpp
+++ b/examples/gestures/gesture-example.cpp
diff --cc examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index 981c6f0,9ecf686..e79ff90
mode 100644,100755..100644
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp