projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d524eab 0965795)
Merge "[NFC] NFCTag attributes implemented" into devel/master
authorJerzy Pabich <j.pabich@samsung.com>
Mon, 29 Dec 2014 13:57:04 +0000 (22:57 +0900)
committerGerrit Code Review <gerrit@tizensrc>
Mon, 29 Dec 2014 13:57:04 +0000 (22:57 +0900)
1  2 
src/nfc/nfc_api.js patch | diff1 | diff2 | blob | history
src/nfc/nfc_instance.cc patch | diff1 | diff2 | blob | history

diff --cc src/nfc/nfc_api.js
Simple merge
diff --cc src/nfc/nfc_instance.cc
Simple merge
Domain: Web Framework / Web API;