Merge remote-tracking branch 'rsa/tizen_2.2' into tizen accepted/tizen/20131014.132025 accepted/tizen/20131014.194458 accepted/tizen/20131018.230520 accepted/tizen/20131112.015430 accepted/tizen_ivi_stable/20131116.111447 submit/tizen/20131014.115345 submit/tizen/20131018.230728 submit/tizen_ivi_stable/20131116.101038
authorHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 11:00:13 +0000 (20:00 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 11:00:13 +0000 (20:00 +0900)
Conflicts:
packaging/wrt-plugins-common.spec

Change-Id: Ife81da92f4c901c6a584ca23c38f05274cab1e7e

1  2 
packaging/wrt-plugins-common.spec
src/dispatch-event/dispatch_event_support.cpp

@@@ -1,12 -1,12 +1,12 @@@
 -#git:framework/web/wrt-plugins-common
  Name:       wrt-plugins-common
- Summary:    WebRuntime common library
- Version:    0.3.112
+ Summary:    wrt-plugins common library
+ Version:    0.3.115
  Release:    1
  Group:      Development/Libraries
 -License:    Apache License, Version 2.0
 +License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
 -
 +Source1001:   wrt-plugins-common.manifest
 +URL:        https://review.tizen.org/git/?p=platform/framework/web/wrt-plugins-common.git;a=summary
  BuildRequires: cmake
  BuildRequires: pkgconfig(dpl-efl)
  BuildRequires: pkgconfig(wrt-plugins-types)