projects / platform / upstream / efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f50e3fe 7fa4a99)
Merge branch 'tizen' into efl120 submit/sandbox/upgrade/efl120/20180319.053334
authorWonki Kim <wonki_.kim@samsung.com>
Mon, 19 Mar 2018 05:29:38 +0000 (14:29 +0900)
committerWonki Kim <wonki_.kim@samsung.com>
Mon, 19 Mar 2018 05:30:23 +0000 (14:30 +0900)
This commit merge branch 'tizen' and 'efl120.
However, old changes on 'tizen' branch could be removed by applying this commit
because of the merge strategy(-s ours, not -X ours)

Change-Id: I6390c045ba9957a6343b89169c35247f69564f14


Trivial merge
Domain: UI Framework / EFL;