projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c757a2 581cf75)
Merge branch 'tizen_5.0' into tizen 05/216405/1 submit/tizen/20191025.073230
authorPiotr Kosko/Engineer/Native/Web API (PLT) /SRPOL/Samsung Electronics <p.kosko@samsung.com>
Thu, 24 Oct 2019 11:00:44 +0000 (13:00 +0200)
committerPiotr Kosko/Engineer/Native/Web API (PLT) /SRPOL/Samsung Electronics <p.kosko@samsung.com>
Thu, 24 Oct 2019 11:00:44 +0000 (13:00 +0200)
Change-Id: I2d06bd464e969ded8967bfbdc3b3df8646384ad0

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 c5c04d7,ef2c444..e81f571
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -6,11 -6,9 +6,11 @@@
  %define crosswalk_extensions tizen-extensions-crosswalk
  
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 +%define tizen_ut_build 0
 +
  
  Name:       webapi-plugins
- Version:    2.53
 -Version:    2.41
++Version:    2.54
  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;