Merge branch 'devel/master' into devel/new_mesh

Conflicts:
	build/tizen/configure.ac

Change-Id: If7a3942fd3f79cfa01b808345875bf121bdb9898

diff --cc adaptors/common/object-profiler.cpp
Simple merge

diff --cc build/tizen/adaptor/Makefile.am
index a0796bc,f9aeee6..d1c9115
--- 1/build/tizen/adaptor/Makefile.am
--- 2/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -269,8 -269,11 +263,10 @@@ libdali_adaptor_la_CXXFLAGS = 
                        $(LIBDRM_CFLAGS) \
                        $(LIBEXIF_CFLAGS) \
                        $(LIBCURL_CFLAGS) \
 -                      $(ASSIMP_CFLAGS) \
                        $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS)
  
+ libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS)
+ 
  libdali_adaptor_la_LIBADD = \
                        $(DALICORE_LIBS) \
                        $(OPENGLES20_LIBS) \

diff --cc build/tizen/configure.ac
index 88c43d7,1f6e8da..7cee705
--- 1/build/tizen/configure.ac
--- 2/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@@ -263,7 -269,7 +255,6 @@@ Configuratio
    Prefix:                           $prefix
    Debug Build:                      $enable_debug
    Compile flags                     $DALI_ADAPTOR_CFLAGS
-   Using JPEG Turbo Library:         $with_jpeg_turbo
 -  Using Assimp Library:             $enable_assimp
    Freetype bitmap support (Emoji):  $freetype_bitmap_support
    Profile:                          $enable_profile
    Data Dir (Read/Write):            $dataReadWriteDir