Merge with master branch
authorKwangyoun Kim <ky85.kim@samsung.com>
Wed, 20 Mar 2013 10:47:34 +0000 (19:47 +0900)
committerKwangyoun Kim <ky85.kim@samsung.com>
Wed, 20 Mar 2013 10:47:34 +0000 (19:47 +0900)
commit15d0bcf3926a4e01778299ee68f89b14ade23545
treebef769ce1817b0f5115f01635b5372237c1ad07d
parentb6dd5399f2665a614fd06c1f9786c9b2cc7e5a67
parentaf3c28bef954884542e62e4db31e06016a2f0e64
Merge with master branch

Change-Id: I35dce97cc44b15252224bdd623e114625e53b4d4
changelog
client/tts_dbus.c
server/ttsd_dbus.c
server/ttsd_player.h
server/ttsd_server.c