projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bdc41f 90dc483)
Merge branch 'tizen_4.0' into tizen_5.0 04/216404/1
authorPiotr Kosko/Engineer/Native/Web API (PLT) /SRPOL/Samsung Electronics <p.kosko@samsung.com>
Thu, 24 Oct 2019 10:52:15 +0000 (12:52 +0200)
committerPiotr Kosko/Engineer/Native/Web API (PLT) /SRPOL/Samsung Electronics <p.kosko@samsung.com>
Thu, 24 Oct 2019 10:52:15 +0000 (12:52 +0200)
Change-Id: I486c2595028dc8e9cf7555aa13ae114fe8af7be3

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

diff --cc packaging/webapi-plugins.spec
index a8e2c23999ac4a8bd9f4b14e69901a8aba05d6ea,91da3167f37fb5c92431905544ad7f253d0480e8..ef2c444b8f2e33461a5be39c787aeb0e26aad642
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -8,7 -8,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
- Version:    2.40
 -Version:    2.36
++Version:    2.41
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/bluetooth/bluetooth_api.js
Simple merge
Domain: Web Framework / Web API;