merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:14 +0000 (01:20 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:14 +0000 (01:20 +0900)
commitb6dd5399f2665a614fd06c1f9786c9b2cc7e5a67
tree09a580de8c893e363e16b8c74b6e2ce8310f18d1
parent099760e600cfc0f3ab61d2e1a93ccee9324534fc
merge with master
36 files changed:
CMakeLists.txt
changelog [changed mode: 0644->0755]
client/CMakeLists.txt [changed mode: 0644->0755]
client/tts-setting.pc.in [changed mode: 0644->0755]
client/tts.c
client/tts.h
client/tts.pc.in [changed mode: 0644->0755]
client/tts_client.c
client/tts_client.h
client/tts_dbus.c
client/tts_dbus.h
client/tts_setting.c
client/tts_setting_dbus.c
common/tts_defs.h
packaging/tts.spec [changed mode: 0644->0755]
server/CMakeLists.txt
server/ttsd.conf [changed mode: 0644->0755]
server/ttsd_config.c
server/ttsd_config.h
server/ttsd_data.cpp
server/ttsd_data.h
server/ttsd_dbus.c
server/ttsd_dbus.h
server/ttsd_dbus_server.c
server/ttsd_dbus_server.h
server/ttsd_engine_agent.c
server/ttsd_main.c
server/ttsd_main.h
server/ttsd_main_noti.c [new file with mode: 0755]
server/ttsd_main_sr.c [new file with mode: 0755]
server/ttsd_network.c
server/ttsd_player.c [moved from server/ttsd_player.cpp with 66% similarity]
server/ttsd_server.c [moved from server/ttsd_server.cpp with 61% similarity]
server/ttsd_server.h
tts-server.manifest [changed mode: 0644->0755]
tts-server.rule [new file with mode: 0755]