projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e9f464 d246d13)
Merge branch 'tizen_3.0' into tizen 54/130954/2 submit/tizen/20170525.061022
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 24 May 2017 12:44:59 +0000 (14:44 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Thu, 25 May 2017 05:41:51 +0000 (07:41 +0200)
Change-Id: I89e72fb15e29c3af954729bfcf509e4ab0765c6d

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/systeminfo/systeminfo_api.js patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
index 10d57c0,15e0d54..1c2d331
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -10,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
--Version:    1.84
++Version:    1.85
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/systeminfo/systeminfo_api.js
Simple merge
Domain: Web Framework / Web API;