Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen accepted/tizen/20131022.010752 accepted/tizen/20131022.162619 submit/tizen/20131021.214451
authorSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 08:18:57 +0000 (17:18 +0900)
committerSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 08:19:26 +0000 (17:19 +0900)
Conflicts:
etc/wrt_commons_create_clean_db.sh

Change-Id: I101e70f5be96342d3de62f1632c7bb9ab9aae0a4

1  2 
etc/wrt_commons_create_clean_db.sh
packaging/wrt-commons.spec

Simple merge
@@@ -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)