projects / platform / core / uifw / dali-extension.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 42ff1c1) | patch
[Tizen] Fix merge conflict on previous commit accepted/tizen/5.0/unified/20181126.062105 submit/tizen_5.0/20181122.071848 submit/tizen_5.0/20181122.121626 submit/tizen_5.0/20181123.054101
authorJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:33:41 +0000 (15:33 +0900)
committerJiyun Yang <ji.yang@samsung.com>
Thu, 22 Nov 2018 06:34:38 +0000 (15:34 +0900)
commit8c9770cd09f5aa9a4006a0916e3854db11898bae
treee9a8a4f70fa87309040b2ec5e2285d31fb417be9tree | snapshot
parent42ff1c1b3e665d288ef71b2eb5e1fc71e7ce5df2commit | diff
[Tizen] Fix merge conflict on previous commit

This reverts commit c0f96fae1e25e210fd480ddfe135636cd5ba86a7.

Change-Id: I76e9358d9f800ff4e07f1242e87d1a762c181b73
packaging/dali-extension.spec diff | blob | history
Domain: Graphics System / DALi; Licenses: Apache-2.0;