Merge branch 'tizen_3.0' into tizen 94/132694/1 accepted/tizen/unified/20170608.072317 submit/tizen/20170607.071201
authorPiotr Kosko <p.kosko@samsung.com>
Wed, 7 Jun 2017 06:56:45 +0000 (08:56 +0200)
committerPiotr Kosko <p.kosko@samsung.com>
Wed, 7 Jun 2017 07:08:31 +0000 (09:08 +0200)
Conflicts:
packaging/webapi-plugins.spec
src/archive/un_zip_extract_request.cc

Change-Id: I1388b6e53bbf293816e32760e4113ecc48b2d4b9

1  2 
packaging/webapi-plugins.spec

@@@ -8,7 -10,7 +8,7 @@@
  %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
  
  Name:       webapi-plugins
--Version:    1.86
++Version:    1.87
  Release:    0
  License:    Apache-2.0 and BSD-3-Clause and MIT
  Group:      Development/Libraries