Merge with master
authorDonghee Ye <donghee.ye@samsung.com>
Mon, 18 Mar 2013 10:45:52 +0000 (19:45 +0900)
committerDonghee Ye <donghee.ye@samsung.com>
Mon, 18 Mar 2013 10:45:52 +0000 (19:45 +0900)
commitdc8e1e8e287491261ce54e4ea5aa0bfba393883f
tree8978da465db14ce800433a55b46753cd15240c80
parent46f12fa934d40fa935ecdeb8a5b4b8248f0caa2d
Merge with master

Change-Id: I4c88b2ed860bc97729ccf79952e16e2960db3555
43 files changed:
CMakeLists.txt
client/ctsvc_client_service.c
client/ctsvc_client_sim.c [deleted file]
common/ctsvc_localize.c
common/ctsvc_normalize.c
common/ctsvc_record.c
common/ctsvc_record_contact.c
common/ctsvc_record_my_profile.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_my_profile.c
common/ipc/ctsvc_ipc_simple_contact.c
contacts-service2.manifest
native/ctsvc_db_init.c
native/ctsvc_db_plugin_contact.c
native/ctsvc_db_plugin_contact_helper.c
native/ctsvc_db_plugin_contact_helper.h
native/ctsvc_db_plugin_image_helper.c
native/ctsvc_db_plugin_my_profile.c
native/ctsvc_db_plugin_name_helper.c
native/ctsvc_db_plugin_person.c
native/ctsvc_db_plugin_person_helper.c
native/ctsvc_db_plugin_person_helper.h
native/ctsvc_db_plugin_simple_contact.c
native/ctsvc_db_query.c
native/ctsvc_person.c
native/ctsvc_restriction.c [deleted file]
native/ctsvc_restriction.h [deleted file]
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_RESTRICTION_CHECK [deleted file]
schema.sql
server/CMakeLists.txt
server/ctsvc_server_bg.c
server/ctsvc_server_bg.h
server/ctsvc_server_sim.c