projects
/
platform
/
core
/
uifw
/
dali-extension.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
2342e61
)
[Tizen] Fix merge conflict on previous commit
36/192436/1
accepted/tizen/5.0/unified/20181106.070424
submit/tizen_5.0/20181105.121940
author
Jiyun Yang
<ji.yang@samsung.com>
Mon, 5 Nov 2018 11:38:22 +0000
(20:38 +0900)
committer
Jiyun Yang
<ji.yang@samsung.com>
Mon, 5 Nov 2018 12:23:43 +0000
(21:23 +0900)
This commit fixes merge conflict on "[Tizen] Update web-engine-plugin to sync with LWE library and dali-adaptor"
Change-Id: I94815540d00e47c026d24bd633d8d6c7ee25a457
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
packaging/dali-extension.spec
patch
|
blob
|
history
diff --git
a/packaging/dali-extension.spec
b/packaging/dali-extension.spec
index
dad94f6
..
116a2d9
100644
(file)
--- a/
packaging/dali-extension.spec
+++ b/
packaging/dali-extension.spec
@@
-89,7
+89,6
@@
Web Engine chromium plugin to support WebView for Dali
Summary: Plugin to support WebView for Dali
Group: System/Libraries
BuildRequires: pkgconfig(libtbm)
-BuildRequires: pkgconfig(libtuv)
BuildRequires: pkgconfig(lightweight-web-engine)
%description web-engine-lite-plugin