merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:13 +0000 (01:20 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:20:13 +0000 (01:20 +0900)
commit66fd65385ebcbf01688e45b1b10e4d1395c5a200
tree90c24eb4dec62a6e0acb0e13c58850eb32f0b3ce
parentd6d1e1efcd77788dfa39fc91eea699451786a2d2
merge with master
28 files changed:
CMakeLists.txt
changelog [moved from debian/changelog with 85% similarity, mode: 0755]
client/CMakeLists.txt [changed mode: 0644->0755]
client/stt.c
client/stt_client.c
client/stt_client.h
client/stt_dbus.c
client/stt_dbus.h
client/stt_setting.c
client/stt_setting_dbus.c
common/stt_defs.h [changed mode: 0644->0755]
packaging/stt.spec [changed mode: 0644->0755]
server/CMakeLists.txt [changed mode: 0644->0755]
server/sttd_config.c
server/sttd_dbus.c
server/sttd_dbus.h
server/sttd_dbus_server.c
server/sttd_dbus_server.h
server/sttd_engine_agent.c
server/sttd_main.c
server/sttd_network.c
server/sttd_network.h
server/sttd_recorder.c
server/sttd_recorder.h
server/sttd_server.c
server/sttd_server.h
server/sttp.h
stt-server.rule [new file with mode: 0755]