projects / platform / core / uifw / dali-extension.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2342e61) | patch
[Tizen] Fix merge conflict on previous commit 35/192435/1 submit/tizen/20181105.120114
authorJiyun Yang <ji.yang@samsung.com>
Mon, 5 Nov 2018 11:38:22 +0000 (20:38 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Mon, 5 Nov 2018 11:38:22 +0000 (20:38 +0900)
commit74893e7b35a42a8f9166854d664294fa66173a2d
treefeadbed736d45624b901b9a58490ce09ebb6b971tree | snapshot
parent2342e61bb668d9aa7cb4b701a834f07ae51afaf6commit | diff
[Tizen] Fix merge conflict on previous commit

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 diff | blob | history
Domain: Graphics System / DALi; Licenses: Apache-2.0;