Merge branch 'tizen_5.0' into tizen_5.5 30/228930/1
authorPiotr Kosko <p.kosko@samsung.com>
Thu, 26 Mar 2020 10:25:26 +0000 (11:25 +0100)
committerPiotr Kosko <p.kosko@samsung.com>
Thu, 26 Mar 2020 10:25:26 +0000 (11:25 +0100)
Change-Id: I4e6eafdfe9c3fc56deed4d50b0a99c08ab877bb6

1  2 
packaging/webapi-plugins.spec
src/alarm/alarm_manager.cc

@@@ -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.61
 -Version:    2.48
++Version:    2.62
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries
Simple merge