Merge remote-tracking branch 'rsa/tizen_2.2' into tizen accepted/tizen/20131002.084346 accepted/tizen/20131002.170213 submit/tizen/20131002.075520
authorHoseon LEE <hoseon46.lee@samsung.com>
Tue, 1 Oct 2013 11:05:03 +0000 (20:05 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Tue, 1 Oct 2013 11:05:03 +0000 (20:05 +0900)
commit8aac1993cb34b02bf2059845f21d6d22feb04dfa
tree3908c754330ccadb118e9b69823f5f4892bb8d32
parent9b7a774e6abb1273214b76e131a8d2f123f9901d
parent2abcec41a8ee38d8d44f36c566d75eace02e6a8f
Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

[Note] Rebase wrt-installer

Conflicts:
CMakeLists.txt
packaging/wrt-installer.spec
packaging/wrt-preinstall-widgets.service
src/CMakeLists.txt
src/configuration_parser/widget_parser.cpp
src/jobs/widget_install/job_widget_install.cpp
src/jobs/widget_install/task_database.cpp
src/jobs/widget_install/task_database.h
src/jobs/widget_install/task_encrypt_resource.cpp
src/jobs/widget_install/task_manifest_file.cpp
src/jobs/widget_install/task_smack.cpp
src/jobs/widget_uninstall/task_db_update.cpp

Change-Id: I23162461f3032edf25dc91daa1077ac87ba0b55c
14 files changed:
CMakeLists.txt
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_database.cpp
src/jobs/widget_install/task_database.h
src/jobs/widget_install/task_encrypt_resource.cpp
src/jobs/widget_install/task_install_ospsvc.cpp
src/jobs/widget_install/task_manifest_file.cpp
src/jobs/widget_install/task_smack.cpp
src/jobs/widget_uninstall/task_db_update.cpp
src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp