projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8662d95 b13f88d)
Merge branch 'devel/master' into devel/new_mesh 80/42380/1 devel/new_mesh
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:01:32 +0000 (15:01 +0100)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 26 Jun 2015 14:01:32 +0000 (15:01 +0100)
Conflicts:
build/tizen/adaptor/Makefile.am

Change-Id: I5a99833c0d29907510de2b25813f091052f1f9c5

1  2 
adaptors/common/indicator-impl.cpp patch | diff1 | diff2 | blob | history
build/tizen/adaptor/Makefile.am patch | diff1 | diff2 | blob | history
build/tizen/configure.ac patch | diff1 | diff2 | blob | history

diff --cc adaptors/common/indicator-impl.cpp
Simple merge
diff --cc build/tizen/adaptor/Makefile.am
index d1c9115,d4504a9..beb39b2
--- 1/build/tizen/adaptor/Makefile.am
--- 2/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)
  
diff --cc build/tizen/configure.ac
Simple merge
Domain: Graphics System / DALi;