OSDN Git Service

merged origin master. resolved conflict in speech.py
authorTakuya Nishimoto <nishimotz@gmail.com>
Sat, 21 Dec 2013 02:33:27 +0000 (11:33 +0900)
committerTakuya Nishimoto <nishimotz@gmail.com>
Sat, 21 Dec 2013 02:33:27 +0000 (11:33 +0900)
commitef323415a440eeb02285405eb7020901c586b42d
tree5706b81ff1e41ab73343cedc35f956376b84f3ba
parent6451a9a9e31fca755cf101fa1f22a73b2cc85d25
parent0f4b17cfe6592004a8bfccd41377f73bc05b7fca
merged origin  resolved conflict in speech.py
source/speech.py