projects / platform / core / uifw / tts.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f228839 152a208)
Merge remote-tracking branch 'origin/tizen_3.0' into tizen 14/117914/1
authorWonnam Jang <wn.jang@samsung.com>
Wed, 8 Mar 2017 04:33:19 +0000 (13:33 +0900)
committerWonnam Jang <wn.jang@samsung.com>
Wed, 8 Mar 2017 04:35:20 +0000 (13:35 +0900)
commit432754c9bf1125a516486885feea2e4204746bd5
tree173cc43b54bfe215bc4783343d2a018a8205821etree | snapshot
parentf228839145ab39d82609c354f038189ab00e7c2dcommit | diff
parent152a2087b7026c8e342b118cbf8994d207980743commit | diff
Merge remote-tracking branch 'origin/tizen_3.0' into tizen

Conflicts:
client/tts_dbus.c
common/tts_config_mgr.c
common/tts_config_parser.c
engine-parser/src/tts-engine-parser.c
server/ttsd_data.cpp
server/ttsd_dbus.c

Change-Id: I3c402f69af42e38cd6c7810ab3f8792a501d39bb
common/tts_config_mgr.c diff1 | diff2 | blob | history
server/ttsd_dbus.c diff1 | diff2 | blob | history
server/ttsd_server.c diff1 | diff2 | blob | history
Domain: UI Framework / Voice;