Merge branch 'tizen_4.0' into tizen

Signed-off-by: huiyu,eun <huiyu.eun@samsung.com>
Conflicts:
	packaging/dali-csharp-binder.spec

Change-Id: I41bc7969c02100f13d98eff84535884ca8bb83f2

diff --cc dali-csharp-binder/file.list
index 92dcb07,f9feefe..911eb0b
--- 1/dali-csharp-binder/file.list
--- 2/dali-csharp-binder/file.list
+++ b/dali-csharp-binder/file.list
@@@ -15,9 -15,12 +15,11 @@@ dali_csharp_binder_src_files = 
    src/text-field.cpp \
    src/window.cpp \
    src/tts-player.cpp \
 -  src/imf-manager.cpp \
    src/input-method-options.cpp \
    src/animation.cpp \
-   src/adaptor.cpp
+   src/watch.cpp \
+   src/adaptor.cpp \
+   src/extents.cpp
  
  # added for key grab binding only for tizen
  dali_csharp_binder_src_files_tizen = \
@@@ -33,13 -36,17 +35,14 @@@
    src/text-field.cpp \
    src/window.cpp \
    src/tts-player.cpp \
 -  src/imf-manager.cpp \
    src/input-method-options.cpp \
+   src/animation.cpp \
    src/key-grab.cpp \
+   src/watch.cpp \
    src/widget_view.cpp \
    src/widget_view_manager.cpp \
-   src/animation.cpp \
 -  src/widget.cpp \
    src/adaptor.cpp \
-   src/widget.cpp
 -  src/extents.cpp \
 -  src/web-view-lite.cpp
++  src/extents.cpp
  
  dali_csharp_binder_header_files = \
    src/common.h

diff --cc dali-csharp-binder/src/dali_wrap.cpp
Simple merge

diff --cc dali-csharp-binder/src/imf-manager.cpp
Simple merge

diff --cc dali-csharp-binder/src/window.cpp
Simple merge