From: sung-su.kim Date: Fri, 27 Sep 2013 00:51:23 +0000 (+0900) Subject: [Release] wrt-installer_0.1.128 X-Git-Tag: 2.2.1_release~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2abcec41a8ee38d8d44f36c566d75eace02e6a8f;p=framework%2Fweb%2Fwrt-installer.git [Release] wrt-installer_0.1.128 Merge branch 'master' into tizen_2.2 Conflicts: configuration/feature-wrt.properties packaging/wrt-installer.spec src/CMakeLists.txt src/configuration_parser/widget_parser.cpp src/jobs/plugin_install/job_plugin_install.cpp src/jobs/plugin_install/plugin_install_task.cpp src/jobs/widget_install/job_widget_install.cpp src/jobs/widget_install/job_widget_install.h src/jobs/widget_install/task_ace_check.cpp src/jobs/widget_install/task_certify.cpp src/jobs/widget_install/task_certify_level.cpp src/jobs/widget_install/task_commons.cpp src/jobs/widget_install/task_configuration.cpp src/jobs/widget_install/task_configuration.h src/jobs/widget_install/task_database.cpp src/jobs/widget_install/task_encrypt_resource.cpp src/jobs/widget_install/task_file_manipulation.cpp src/jobs/widget_install/task_install_ospsvc.cpp src/jobs/widget_install/task_manifest_file.cpp src/jobs/widget_install/task_pkg_info_update.cpp src/jobs/widget_install/task_prepare_files.cpp src/jobs/widget_install/task_prepare_reinstall.cpp src/jobs/widget_install/task_recovery.cpp src/jobs/widget_install/task_remove_backup.cpp src/jobs/widget_install/task_smack.cpp src/jobs/widget_install/task_update_files.cpp src/jobs/widget_install/task_widget_config.cpp src/jobs/widget_install/widget_install_context.h src/jobs/widget_install/widget_unzip.cpp src/jobs/widget_uninstall/job_widget_uninstall.cpp src/jobs/widget_uninstall/task_check.cpp src/jobs/widget_uninstall/task_db_update.cpp src/jobs/widget_uninstall/task_delete_pkginfo.cpp src/jobs/widget_uninstall/task_remove_custom_handlers.cpp src/jobs/widget_uninstall/task_remove_files.cpp src/jobs/widget_uninstall/task_smack.cpp src/jobs/widget_uninstall/task_uninstall_ospsvc.cpp src/logic/installer_logic.cpp src/misc/feature_logic.cpp src/pkg-manager/backendlib.cpp src/pkg-manager/pkgmgr_signal.cpp src/wrt-installer/installer_callbacks_translate.cpp src/wrt-installer/plugin_utils.cpp src/wrt-installer/wrt-installer.cpp src/wrt-installer/wrt_installer_api.cpp tests/general/CMakeLists.txt tests/general/TestInit.cpp Change-Id: I1f5de63cb4237da48523dc60e4c56a7bfad5e179 --- 2abcec41a8ee38d8d44f36c566d75eace02e6a8f