projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14e60fd 557cd7f)
Merge branch 'tizen_3.0' into tizen 19/139519/1 accepted/tizen/unified/20170719.132325 submit/tizen/20170719.080849 submit/tizen/20170719.081707
authorLukasz Bardeli <l.bardeli@samsung.com>
Wed, 19 Jul 2017 07:57:08 +0000 (09:57 +0200)
committerLukasz Bardeli <l.bardeli@samsung.com>
Wed, 19 Jul 2017 07:58:07 +0000 (09:58 +0200)
Change-Id: I5d4245b4f62c0802e9d73397df97d097683d05b9

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 dcb78cb5768e9e8fcd48477c43aa829940228b3f,926b460d72499e5c7c635c76d72f97c68f6ea2e2..c69cac6aef7463edf24348cccaadffa1a6e05353
--- 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.91
++Version:    1.92
  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;