projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd1c341 868d655)
Merge branch 'tizen_3.0' into tizen_4.0 42/169242/1 accepted/tizen/4.0/unified/20180205.144611 submit/tizen_4.0/20180205.082909
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 5 Feb 2018 06:57:27 +0000 (07:57 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 5 Feb 2018 06:57:32 +0000 (07:57 +0100)
Change-Id: I341501004603b29f58f41320ab1093f09f039af6

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/nfc/nfc_api.js patch | diff1 | diff2 | blob | history
src/nfc/nfc_util.cc patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
Simple merge
diff --cc src/nfc/nfc_api.js
Simple merge
diff --cc src/nfc/nfc_util.cc
Simple merge
Domain: Web Framework / Web API;