merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:42 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:42 +0000 (01:17 +0900)
commit46f12fa934d40fa935ecdeb8a5b4b8248f0caa2d
tree26e56989aeee39877b63bdc6b1999dbbcb66b45c
parent11a3f117dca9ddd520fc76650858c60f69d2bdb5
merge with master
131 files changed:
CMakeLists.txt
build-util/DB-schema-gen2.c [new file with mode: 0755]
build-util/generator.sh
client/CMakeLists.txt
client/ctsvc_client_activity.c
client/ctsvc_client_db.c
client/ctsvc_client_group.c
client/ctsvc_client_ipc.c [changed mode: 0755->0644]
client/ctsvc_client_ipc.h
client/ctsvc_client_person.c
client/ctsvc_client_phonelog.c
client/ctsvc_client_service.c
client/ctsvc_client_sim.c
common/ctsvc_filter.c
common/ctsvc_internal.h
common/ctsvc_list.c
common/ctsvc_localize.c
common/ctsvc_localize.h
common/ctsvc_localize_ch.c
common/ctsvc_normalize.c
common/ctsvc_normalize.h
common/ctsvc_notify.h
common/ctsvc_record.c
common/ctsvc_record.h
common/ctsvc_record_contact.c
common/ctsvc_record_my_profile.c
common/ctsvc_record_person.c
common/ctsvc_record_updated_info.c
common/ctsvc_setting.c
common/ctsvc_struct.h
common/ctsvc_vcard.c
common/ctsvc_view.c
common/ctsvc_view.h
common/ipc/ctsvc_ipc_contact.c
common/ipc/ctsvc_ipc_define.h
common/ipc/ctsvc_ipc_event.c
common/ipc/ctsvc_ipc_marshal.c
common/ipc/ctsvc_ipc_person.c
common/ipc/ctsvc_ipc_updated_info.c
contacts-service2.manifest
include/contacts.h
include/contacts_db.h
include/contacts_filter.h
include/contacts_group.h
include/contacts_utils.h
include/contacts_vcard.h
include/contacts_views.h
native/ctsvc_activity.c
native/ctsvc_db_init.c
native/ctsvc_db_plugin_activity.c
native/ctsvc_db_plugin_address.c
native/ctsvc_db_plugin_address_helper.c
native/ctsvc_db_plugin_address_helper.h
native/ctsvc_db_plugin_addressbook.c
native/ctsvc_db_plugin_company.c
native/ctsvc_db_plugin_company_helper.c
native/ctsvc_db_plugin_company_helper.h
native/ctsvc_db_plugin_contact.c
native/ctsvc_db_plugin_contact_helper.c
native/ctsvc_db_plugin_contact_helper.h
native/ctsvc_db_plugin_email.c
native/ctsvc_db_plugin_email_helper.c
native/ctsvc_db_plugin_email_helper.h
native/ctsvc_db_plugin_event.c
native/ctsvc_db_plugin_event_helper.c
native/ctsvc_db_plugin_event_helper.h
native/ctsvc_db_plugin_extension.c
native/ctsvc_db_plugin_extension_helper.c
native/ctsvc_db_plugin_extension_helper.h
native/ctsvc_db_plugin_group.c
native/ctsvc_db_plugin_image.c
native/ctsvc_db_plugin_image_helper.c
native/ctsvc_db_plugin_image_helper.h
native/ctsvc_db_plugin_messenger.c
native/ctsvc_db_plugin_messenger_helper.c
native/ctsvc_db_plugin_messenger_helper.h
native/ctsvc_db_plugin_my_profile.c
native/ctsvc_db_plugin_name.c
native/ctsvc_db_plugin_name_helper.c
native/ctsvc_db_plugin_name_helper.h
native/ctsvc_db_plugin_nickname.c
native/ctsvc_db_plugin_nickname_helper.c
native/ctsvc_db_plugin_nickname_helper.h
native/ctsvc_db_plugin_note.c
native/ctsvc_db_plugin_note_helper.c
native/ctsvc_db_plugin_note_helper.h
native/ctsvc_db_plugin_number.c
native/ctsvc_db_plugin_number_helper.c
native/ctsvc_db_plugin_number_helper.h
native/ctsvc_db_plugin_person.c
native/ctsvc_db_plugin_person_helper.c
native/ctsvc_db_plugin_phonelog.c
native/ctsvc_db_plugin_profile.c
native/ctsvc_db_plugin_profile_helper.c
native/ctsvc_db_plugin_profile_helper.h
native/ctsvc_db_plugin_relationship.c
native/ctsvc_db_plugin_relationship_helper.c
native/ctsvc_db_plugin_relationship_helper.h
native/ctsvc_db_plugin_sdn.c
native/ctsvc_db_plugin_simple_contact.c
native/ctsvc_db_plugin_speeddial.c
native/ctsvc_db_plugin_url.c
native/ctsvc_db_plugin_url_helper.c
native/ctsvc_db_plugin_url_helper.h
native/ctsvc_db_query.c
native/ctsvc_db_query.h
native/ctsvc_group.c
native/ctsvc_notification.c
native/ctsvc_notification.h
native/ctsvc_person.c
native/ctsvc_schema.h
native/ctsvc_service.c
native/ctsvc_sqlite.c
native/ctsvc_utils.c
native/ctsvc_utils.h
packaging/contacts-service.spec
res/.CONTACTS_SVC_FAVOR_CHANGED [deleted file]
res/.CONTACTS_SVC_GROUP_REL_CHANGED [deleted file]
res/.CONTACTS_SVC_MISSED_CHANGED [deleted file]
schema.sql
server/ctsvc_ipc_server.c
server/ctsvc_ipc_server2.c
server/ctsvc_ipc_server2.h
server/ctsvc_schema_recovery.c
server/ctsvc_server.c
server/ctsvc_server_sim.c
server/ctsvc_server_sqlite.c
server/ctsvc_server_sqlite.h
server/ctsvc_server_utils.c
server/ctsvc_server_utils.h
server/internal.h