projects / platform / core / api / webapi-plugins.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed61d69 f745269)
Merge branch 'tizen_3.0' into tizen_4.0 44/167244/2 accepted/tizen/4.0/unified/20180116.143044 submit/tizen_4.0/20180116.110851
authorPiotr Kosko <p.kosko@samsung.com>
Tue, 16 Jan 2018 09:48:26 +0000 (10:48 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Tue, 16 Jan 2018 10:18:50 +0000 (11:18 +0100)
commit50e272196a883f11b1419dae405eb4db8bde5537
treefd8cba5bc18e3935d7c6cf4977d93daf0696b977tree | snapshot
parented61d69f4ff64f19ed81b09fba257dfe57bc56a9commit | diff
parentf745269c0e4e1efa1f78ac9579c4fe33a5b0c74ccommit | diff
Merge branch 'tizen_3.0' into tizen_4.0

Conflicts:
src/filesystem/filesystem_instance.cc
src/filesystem/js/file.js

Change-Id: I355ce9bb6d27d1990267994f0cfec5c7eaa07792
packaging/webapi-plugins.spec diff1 | diff2 | blob | history
src/alarm/alarm_instance.cc diff1 | diff2 | blob | history
src/nfc/nfc_api.js diff1 | diff2 | blob | history
Domain: Web Framework / Web API;