Merge remote-tracking branch 'rsa/tizen_2.2' into tizen accepted/tizen/20131014.173528 submit/tizen/20131014.115554
authorHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 11:45:14 +0000 (20:45 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Mon, 14 Oct 2013 11:45:14 +0000 (20:45 +0900)
commit12d822f44859f7103af56ce5d3cad22cb8bc3048
treeaf3447ba235e6399131c312c0ead48d6b0729d97
parent8aac1993cb34b02bf2059845f21d6d22feb04dfa
parentc7eea910ed0210300b04f17e1f4b4e159b882647
Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

Conflicts:
src/jobs/widget_install/task_manifest_file.cpp

Change-Id: Ib3bf102458e896d99bf9b8238de29ece101b29c8
packaging/wrt-installer.spec
src/CMakeLists.txt
src/configuration_parser/widget_parser.cpp
src/jobs/widget_install/manifest.cpp
src/jobs/widget_install/manifest.h
src/jobs/widget_install/task_encrypt_resource.cpp
src/jobs/widget_install/task_manifest_file.cpp