projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56004c5 6c1109c)
Merge branch 'tizen_3.0' into tizen_4.0 65/152965/1 accepted/tizen/4.0/unified/20170929.075732 submit/tizen_4.0/20170927.114247
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 27 Sep 2017 11:26:28 +0000 (13:26 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Wed, 27 Sep 2017 11:26:28 +0000 (13:26 +0200)
Conflicts:
packaging/webapi-plugins.spec

Change-Id: I4396c1ca3a1415cfbe4cd9ca0edc9351b5053615

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
Simple merge
Domain: Web Framework / Web API;