Merge remote-tracking branch 'rsa/tizen_2.2' into tizen tizen accepted/tizen/20131002.084307 accepted/tizen/20131002.170401 submit/tizen/20131002.083843 submit/tizen/20131116.070012
authorHoseon LEE <hoseon46.lee@samsung.com>
Wed, 2 Oct 2013 08:37:13 +0000 (17:37 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Wed, 2 Oct 2013 08:37:13 +0000 (17:37 +0900)
commit6d27df2f5527fac32b56e4b47b3c333013aa5e09
treec6210565b99629e6560d1c353a21de695dfe374a
parente7cafc547aee71395d6bfa6aaec23c56e4982a54
parentd6cff3a5a7d15dc5817ad0e9e743924ddcbd9a42
Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

[Note] Rebase wrt-setting

Conflicts:
webapp-detail/CMakeLists.txt

Change-Id: Icbe12b323a05c1b2453192c3e98482174d440519
packaging/wrt-setting.spec
webapp-detail/CMakeLists.txt