From: Sunghyun kim <scholb.kim@samsung.com>
Date: Tue, 1 Oct 2019 07:36:09 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20191004.003531~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8eb8cf032269c91b80102ceaf0bf2c24eba181df;hp=-c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into tizen
---

8eb8cf032269c91b80102ceaf0bf2c24eba181df
diff --combined packaging/dali-adaptor.spec
index 8a8e656,e24ead7..6ef050a
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -17,7 -17,7 +17,7 @@@
  
  Name:       dali-adaptor
  Summary:    The DALi Tizen Adaptor
- Version:    1.4.38
+ Version:    1.4.39
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0 and BSD-3-Clause and MIT
@@@ -65,7 -65,6 +65,7 @@@ BuildRequires:  fribidi-deve
  BuildRequires:  pkgconfig(capi-system-info)
  BuildRequires:  pkgconfig(capi-system-sensor)
  
 +BuildRequires:  pkgconfig(libcrypto)
  BuildRequires:  pkgconfig(cairo)
  
  BuildRequires:  pkgconfig(wayland-egl)