projects / platform / core / api / webapi-plugins.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efc2252 18b020b)
Merge branch 'tizen_5.5' into tizen_6.0 29/247929/2
authorPiotr Kosko/Native/Web API (PLT) /SRPOL/Engineer/Samsung Electronics <p.kosko@samsung.com>
Wed, 18 Nov 2020 11:27:12 +0000 (12:27 +0100)
committerPiotr Kosko/Native/Web API (PLT) /SRPOL/Engineer/Samsung Electronics <p.kosko@samsung.com>
Wed, 18 Nov 2020 11:27:12 +0000 (12:27 +0100)
Change-Id: If24e8f3bf63cc1315e49ea67801d2742b8f7eb55

1  2 
packaging/webapi-plugins.spec patch | diff1 | diff2 | blob | history
src/filesystem/filesystem_instance.cc patch | diff1 | diff2 | blob | history
src/filesystem/js/file_stream.js patch | diff1 | diff2 | blob | history

diff --cc packaging/webapi-plugins.spec
index 3b702d1,79244b4..dbad03b
--- 1/packaging/webapi-plugins.spec
--- 2/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@@ -10,7 -10,7 +10,7 @@@
  
  
  Name:       webapi-plugins
- Version:    2.76
 -Version:    2.69
++Version:    2.77
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
diff --cc src/filesystem/filesystem_instance.cc
Simple merge
diff --cc src/filesystem/js/file_stream.js
Simple merge
Domain: Web Framework / Web API;