From: Piotr Kosko <p.kosko@samsung.com>
Date: Wed, 7 Jun 2017 06:56:45 +0000 (+0200)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170607.071201^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8cbe0a23eb64e02f6813a3821e02f54e269608d;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

Merge branch 'tizen_3.0' into tizen

Conflicts:
	packaging/webapi-plugins.spec
	src/archive/un_zip_extract_request.cc

Change-Id: I1388b6e53bbf293816e32760e4113ecc48b2d4b9
---

d8cbe0a23eb64e02f6813a3821e02f54e269608d
diff --cc packaging/webapi-plugins.spec
index 3532c4eb,c3c7348b..3da147e5
--- a/packaging/webapi-plugins.spec
+++ b/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