From: Soo-Hyun Choi <s.choi@hackerslab.eu>
Date: Sun, 20 Oct 2013 08:18:57 +0000 (+0900)
Subject: Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen
X-Git-Tag: accepted/tizen/20131022.010752^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b30aa3c5bfc0360fab144d0317c5a8528afbe43;p=platform%2Fframework%2Fweb%2Fwrt-commons.git

Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

Conflicts:
	etc/wrt_commons_create_clean_db.sh

Change-Id: I101e70f5be96342d3de62f1632c7bb9ab9aae0a4
---

3b30aa3c5bfc0360fab144d0317c5a8528afbe43
diff --cc packaging/wrt-commons.spec
index e8ae047,d26c39c..fc1bf8f
--- a/packaging/wrt-commons.spec
+++ b/packaging/wrt-commons.spec
@@@ -1,11 -1,12 +1,11 @@@
 -#git:framework/web/wrt-commons
  Name:       wrt-commons
  Summary:    Wrt common library
- Version:    0.2.157
+ Version:    0.2.158
  Release:    1
 -Group:      Development/Libraries
 -License:    Apache License, Version 2.0
 -URL:        N/A
 +Group:      System/Libraries
 +License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
 +Source1001: 	wrt-commons.manifest
  BuildRequires:  cmake
  BuildRequires:  pkgconfig(ecore)
  BuildRequires:  pkgconfig(appcore-efl)