From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 26 Jun 2015 14:01:32 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/new_mesh
X-Git-Tag: dali_1.0.47~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdevel%2Fnew_mesh;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into devel/new_mesh

Conflicts:
	build/tizen/adaptor/Makefile.am

Change-Id: I5a99833c0d29907510de2b25813f091052f1f9c5
---

f87739ae1b991b74a1528497d387e6acd29ef534
diff --cc build/tizen/adaptor/Makefile.am
index d1c9115,d4504a9..beb39b2
--- a/build/tizen/adaptor/Makefile.am
+++ b/build/tizen/adaptor/Makefile.am
@@@ -263,7 -269,9 +263,8 @@@ libdali_adaptor_la_CXXFLAGS = 
                        $(LIBDRM_CFLAGS) \
                        $(LIBEXIF_CFLAGS) \
                        $(LIBCURL_CFLAGS) \
-                       $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS)
 -                      $(ASSIMP_CFLAGS) \
+                       $(CAPI_SYSTEM_SYSTEM_SETTINGS_CFLAGS) \
+                       $(ELDBUS_CFLAGS)
  
  libdali_adaptor_la_CFLAGS = $(libdali_adaptor_la_CXXFLAGS)