projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d7f367 e06b5ad)
Merge branch 'tizen_4.0' into tizen 83/171083/1 submit/tizen/20180228.082430
authorPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:58:41 +0000 (10:58 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Mon, 26 Feb 2018 09:58:41 +0000 (10:58 +0100)
Conflicts:
src/nfc/nfc_message_utils.cc

Change-Id: Iec3145fba1c248841abce2dabbd9c912347aa198

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/messageport/messageport_instance.cc patch | diff1 | diff2 | blob | history

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