merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:59 +0000 (01:19 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:19:59 +0000 (01:19 +0900)
commit0ffa092e0f7b6f483752d73a9114d48be308a596
tree8fd7da988af41d995a11f3e79a08b42b1dcdc063
parent12215fcb69b31b3ca209718b4236bd585b6abee2
merge with master
59 files changed:
Makefile.am
configure.ac
isf.manifest
isf.rule [new file with mode: 0755]
ism/configs/config
ism/demos/Makefile.am
ism/demos/include/isf_demo_efl.h
ism/demos/include/isf_language_efl.h [new file with mode: 0644]
ism/demos/isf_autocapital_efl.cpp
ism/demos/isf_demo_efl.cpp
ism/demos/isf_entry_event_efl.cpp
ism/demos/isf_event_efl.cpp
ism/demos/isf_imcontrol_efl.cpp
ism/demos/isf_imdata_set_efl.cpp
ism/demos/isf_language_efl.cpp [new file with mode: 0644]
ism/demos/isf_layout_efl.cpp
ism/demos/isf_prediction_efl.cpp
ism/demos/isf_return_key_disable_efl.cpp
ism/demos/isf_return_key_type_efl.cpp
ism/extras/efl_immodule/Makefile.am
ism/extras/efl_immodule/isf_imf_context.cpp
ism/extras/efl_immodule/isf_imf_context.h
ism/extras/efl_immodule/isf_imf_control.cpp
ism/extras/efl_immodule/isf_imf_control.h
ism/extras/efl_immodule/isf_imf_control_ui.cpp
ism/extras/efl_immodule/isf_imf_control_ui.h
ism/extras/efl_immodule/isf_imf_module.cpp
ism/extras/efl_panel/Makefile.am
ism/extras/efl_panel/isf_panel_efl.cpp
ism/extras/efl_panel/isf_panel_utility.cpp
ism/extras/efl_setting/isf_setting_efl.cpp
ism/modules/frontend/scim_socket_frontend.cpp
ism/modules/imengine/scim_socket_imengine.cpp
ism/src/Makefile.am
ism/src/isf_control.cpp
ism/src/isf_control.h
ism/src/isf_imcontrol_client.cpp
ism/src/isf_imcontrol_client.h
ism/src/scim.cpp
ism/src/scim_backend.cpp
ism/src/scim_event.h
ism/src/scim_global_config.cpp
ism/src/scim_global_config.h
ism/src/scim_helper_launcher.cpp
ism/src/scim_panel_agent.cpp
ism/src/scim_panel_agent.h
ism/src/scim_panel_client.cpp
ism/src/scim_trans_commands.h
ism/src/scim_transaction.cpp
ism/src/scim_utility.cpp
packaging/isf.changes
packaging/isf.spec
po/isfsetting_efl/es_MX.po [new file with mode: 0644]
po/isfsetting_efl/update-po.sh
po/kbwizard_efl/es_MX.po [new file with mode: 0644]
po/kbwizard_efl/update-po.sh
po/scim/es_MX.po [new file with mode: 0644]
po/scim/update-po.sh
releasenote.txt