Merge branch working into tizen
authorHoseon LEE <hoseon46.lee@samsung.com>
Sun, 29 Sep 2013 07:11:47 +0000 (16:11 +0900)
committerHoseon LEE <hoseon46.lee@samsung.com>
Sun, 29 Sep 2013 07:17:25 +0000 (16:17 +0900)
commit6f29260d365e5d81caab020c1430d61e7ab40b51
treeddfb769a69073995fcbbca9dc24dba198a0f8ec6
parent4d2f197e1242d2ede388494cb69382e32e529cb5
parent30aa4ca3f7bffadd195cbd39625fe8a7448dbd11
Merge branch working into tizen

Conflicts:
CMakeLists.txt
packaging/wrt.spec
src/view/common/application_launcher.cpp
src/view/common/scheme_action_map_data.h
src/view/webkit/ewk_context_manager.cpp
src/view/webkit/injected-bundle/CMakeLists.txt
src/view/webkit/injected-bundle/wrt-injected-bundle.cpp
src/view/webkit/view_logic_service_support.cpp
src/wrt-client/window_data.cpp
src/wrt-client/wrt-client.cpp
src/wrt-client/wrt-client.h
src/wrt-launcher/wrt-launcher.cpp
src/wrt-launchpad-daemon/legacy/preload_list_wrt.txt

Change-Id: I34297e3a0e893eb64f0b62a776aa21f8b51ed930
15 files changed:
CMakeLists.txt
packaging/wrt.spec
src/CMakeLists.txt
src/api_new/CMakeLists.txt
src/plugin-service/CMakeLists.txt
src/view/common/scheme_action_map_data.h
src/view/webkit/ewk_context_manager.cpp
src/view/webkit/injected-bundle/CMakeLists.txt
src/view/webkit/injected-bundle/injected_bundle_uri_handling.cpp
src/wrt-client/window_data.cpp
src/wrt-client/wrt-client.cpp
src/wrt-client/wrt-client.h
src/wrt-launchpad-daemon/CMakeLists.txt
src/wrt-launchpad-daemon/include/launchpad_util.h
systemd/wrt_launchpad_daemon@.service