Commit Graph
100 Commits
Author SHA1 Message Date
Reece H. Dunn 8f98a0755c 1.47.12 (from http://espeak.sourceforge.net/test/latest.html) 2013-09-23 22:26:38 +01:00
Reece H. Dunn 1f57e2debe Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-09-23 22:19:52 +01:00
Reece H. Dunn 116d929027 Change the mode of tsh_unasp2.wav to 644. 2013-06-13 14:59:16 +01:00
Reece H. Dunn 17e389e7f1 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-06-13 14:46:46 +01:00
Reece H. Dunn d1df4cba10 Merge branch 'upstream' into development 2013-06-01 10:32:26 +01:00
Reece H. Dunn 64bed76f18 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-05-31 20:53:54 +01:00
Reece H. Dunn 083f40d783 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-05-29 18:24:56 +01:00
Reece H. Dunn 2cd6e65f49 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-05-18 13:46:57 +01:00
Reece H. Dunn 1df4cc789e Remove the executable bit from the new source files. 2013-05-04 09:37:11 +01:00
Reece H. Dunn 187ed49e2b Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-05-04 09:30:42 +01:00
Reece H. Dunn b169457177 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-05-03 18:51:54 +01:00
Reece H. Dunn c74b843874 1.47.10a (from http://espeak.sourceforge.net/test/latest.html) 2013-05-03 16:24:33 +01:00
Reece H. Dunn f8dab45a96 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-05-03 16:19:22 +01:00
Reece H. Dunn 788ef97025 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/si_list
	dictsource/si_rules
	dictsource/ur_list
	dictsource/ur_rules
	phsource/compile_report
2013-05-01 09:20:57 +01:00
Reece H. Dunn cfe5152b17 1.47.09 (from http://espeak.sourceforge.net/test/latest.html) 2013-04-30 11:34:51 +01:00
Reece H. Dunn 09cc97a41c Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ustop/th_rfx.wav
2013-04-30 11:28:41 +01:00
Reece H. Dunn d2aad31451 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-04-27 00:42:55 +01:00
Reece H. Dunn a43db2baaa Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-04-26 18:34:40 +01:00
Reece H. Dunn e972d0a6ca 1.47.07b (from http://espeak.sourceforge.net/test/latest.html) 2013-04-25 23:31:34 +01:00
Reece H. Dunn bf47234817 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_azerbaijani
2013-04-25 23:22:14 +01:00
Reece H. Dunn 9f435e284c 1.47.07a (from http://espeak.sourceforge.net/test/latest.html) 2013-04-24 12:41:36 +01:00
Reece H. Dunn ac45bd4e80 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/ms
	phsource/compile_report
2013-04-24 12:33:33 +01:00
Reece H. Dunn 81cda039f3 Merge branch 'upstream' into development 2013-04-19 10:18:48 +01:00
Reece H. Dunn a0fc2d46c4 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-04-18 19:04:52 +01:00
Reece H. Dunn 0957ba9f3d 1.47.06 (from http://espeak.sourceforge.net/test/latest.html) 2013-04-16 08:55:00 +01:00
Reece H. Dunn 7245bda467 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-04-16 08:49:57 +01:00
Reece H. Dunn 13c4d1b92d Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-04-11 10:15:49 +01:00
Reece H. Dunn 9ab8a5d0f8 1.47.05 (from http://espeak.sourceforge.net/test/latest.html) 2013-04-09 11:25:54 +01:00
Reece H. Dunn ed6c99b2f2 Merge branch 'upstream' into development 2013-04-09 11:21:35 +01:00
Reece H. Dunn 3eea01682f Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-04-08 21:19:02 +01:00
Reece H. Dunn 665b0f2963 1.47.04a (from http://espeak.sourceforge.net/test/latest.html) 2013-04-05 12:58:19 +01:00
Reece H. Dunn 320920cd8d Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-04-05 12:55:09 +01:00
Reece H. Dunn 530253327b 1.47.04 (from http://espeak.sourceforge.net/test/latest.html) 2013-04-02 17:34:22 +01:00
Reece H. Dunn 22b8f2e852 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_sinhala
	phsource/ph_urdu
	platforms/windows/make_espeak.iss
	platforms/windows/make_espeakedit.iss
2013-04-02 17:31:25 +01:00
Reece H. Dunn a800efcd42 1.47.03f (from http://espeak.sourceforge.net/test/latest.html) 2013-04-01 00:42:55 +01:00
Reece H. Dunn 5b4c90f6c1 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-04-01 00:37:36 +01:00
Reece H. Dunn b01a65df16 1.47.03e (from http://espeak.sourceforge.net/test/latest.html) 2013-03-29 12:12:21 +00:00
Reece H. Dunn a7f93e1845 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-29 12:09:33 +00:00
Reece H. Dunn e1ff0b56dc 1.47.03d (from http://espeak.sourceforge.net/test/latest.html) 2013-03-27 00:40:12 +00:00
Reece H. Dunn 29320ae2ea Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/te_list
	dictsource/te_rules
	phsource/compile_report
2013-03-27 00:33:34 +00:00
Reece H. Dunn 52d5ce901d 1.47.03c (from http://espeak.sourceforge.net/test/latest.html) take 2
This deletes the rules/list files removed from the sources as they
have been removed from the dict_phoneme file.
2013-03-26 02:48:10 +00:00
Reece H. Dunn d781d10019 1.47.03c (from http://espeak.sourceforge.net/test/latest.html) 2013-03-26 01:25:20 +00:00
Reece H. Dunn 67ae48acc7 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/kl_list
	dictsource/kl_rules
	dictsource/pa_list
	dictsource/pa_rules
	phsource/compile_report
2013-03-26 01:17:35 +00:00
Reece H. Dunn 9ce297b0cb 1.47.03b (from http://espeak.sourceforge.net/test/latest.html) 2013-03-23 11:39:53 +00:00
Reece H. Dunn b5bb7c7b63 Merge branch 'upstream' into development
Conflicts:
	dictsource/bn_list
	dictsource/bn_rules
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_bengali
2013-03-23 11:32:54 +00:00
Reece H. Dunn 3f9067c99a Merge commit 'be3933d1d3' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-23 11:23:08 +00:00
Reece H. Dunn 3384bf4fd2 1.47.03 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-21 14:49:38 +00:00
Reece H. Dunn 1ee6f3cbbc Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-21 14:42:57 +00:00
Reece H. Dunn 8d6fac1c28 1.47.02 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-19 10:32:22 +00:00
Reece H. Dunn d97e64ab05 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
2013-03-19 10:27:48 +00:00
Reece H. Dunn 3305f6c83e Merge branch 'upstream' into development
Conflicts:
	espeak-data/voices/asia/fa
	espeak-data/voices/asia/fa-pin
	espeak-data/voices/asia/ka
	espeak-data/voices/asia/ne
	espeak-data/voices/asia/pa
	espeak-data/voices/asia/vi-hue
	espeak-data/voices/europe/an
	espeak-data/voices/europe/bg
	espeak-data/voices/europe/et
	espeak-data/voices/europe/ga
	espeak-data/voices/europe/lt
2013-03-18 11:54:58 +00:00
Reece H. Dunn ab693678ef 1.47.01 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-18 11:53:23 +00:00
Reece H. Dunn b3f3908226 Merge commit '4634aa43a5' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vdiph/eei_5
	phsource/vdiph2/i@_3
	phsource/vietnam/_c.wav
	phsource/vietnam/a
	phsource/vietnam/ch.wav
	phsource/vietnam/dd.wav
	phsource/vietnam/ie_2
	phsource/vietnam/oe
	phsource/vietnam/th.wav
	phsource/vietnam/tr.wav
	platforms/windows/make_espeakedit.iss
	src/Makefile
2013-03-18 11:43:32 +00:00
Reece H. Dunn 678aef04b6 1.46.53 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-17 00:54:24 +00:00
Reece H. Dunn 790c151a4d Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vnasal/a#_n2
	phsource/vnasal/o_n4
2013-03-17 00:51:22 +00:00
Reece H. Dunn b51fe6f892 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-16 15:52:46 +00:00
Reece H. Dunn 3ec15aa700 1.46.50 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-15 16:53:33 +00:00
Reece H. Dunn 2db0566941 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-15 16:50:36 +00:00
Reece H. Dunn d695786e54 1.46.49 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-14 11:04:59 +00:00
Reece H. Dunn 2338a6c6f3 Merge branch 'upstream' into development 2013-03-14 11:00:26 +00:00
Reece H. Dunn 7987f1693e Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-13 18:50:42 +00:00
Reece H. Dunn 82d47f803e 1.46.47 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-13 16:30:43 +00:00
Reece H. Dunn 9468e46243 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-13 16:27:55 +00:00
Reece H. Dunn 5f27ee1f93 1.46.46 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-11 22:16:51 +00:00
Reece H. Dunn b90e1db85a Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-11 22:13:40 +00:00
Reece H. Dunn 9ef3750d39 1.46.45 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-10 14:21:51 +00:00
Reece H. Dunn ab57561283 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-10 14:19:08 +00:00
Reece H. Dunn 280f0a1c29 1.46.44 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-08 21:37:32 +00:00
Reece H. Dunn ef57a43375 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_irish
2013-03-08 21:34:11 +00:00
Reece H. Dunn ac03f8483a 1.46.43 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-07 10:58:31 +00:00
Reece H. Dunn ed3b3b4020 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-07 10:54:25 +00:00
Reece H. Dunn d78b391acd 1.46.42 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-07 00:58:10 +00:00
Reece H. Dunn c6c199d804 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-07 00:53:07 +00:00
Reece H. Dunn 4f00e22bac 1.46.41 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-03 21:21:31 +00:00
Reece H. Dunn ea65fda835 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-03 21:17:42 +00:00
Reece H. Dunn c229b34ae2 1.46.39 (from http://espeak.sourceforge.net/test/latest.html) 2013-03-02 17:08:18 +00:00
Reece H. Dunn 0c1c07d32d Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-03-02 17:03:54 +00:00
Reece H. Dunn 75e239dadc 1.46.38 (from http://espeak.sourceforge.net/test/latest.html) 2013-02-28 13:53:37 +00:00
Reece H. Dunn 1228e4270e Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-02-28 13:17:38 +00:00
Reece H. Dunn 5f2c8175c1 1.46.37 (from http://espeak.sourceforge.net/test/latest.html) 2013-02-21 23:34:12 +00:00
Reece H. Dunn 303404766e Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	platforms/windows/espeakedit/src/speech.h
	platforms/windows/espeakedit/src_copy/speech.h
2013-02-21 23:28:10 +00:00
Reece H. Dunn c1e02cb0b8 1.46.35 (from http://espeak.sourceforge.net/test/latest.html) 2013-02-20 08:20:48 +00:00
Reece H. Dunn ee26fcec34 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-02-20 08:11:33 +00:00
Reece H. Dunn 1de6c42722 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-02-14 16:16:06 +00:00
Reece H. Dunn cd6a5c6834 1.46.34 (from http://espeak.sourceforge.net/test/latest.html) 2013-02-12 19:19:48 +00:00
Reece H. Dunn 5e673ec285 1.46.33 (from http://espeak.sourceforge.net/test/latest.html) 2013-02-11 10:39:13 +00:00
Reece H. Dunn d9e0cbd4c2 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-02-11 10:35:20 +00:00
Reece H. Dunn 2ec786ae07 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-01-30 16:32:01 +00:00
Reece H. Dunn 2fbab050f9 1.46.31 (from http://espeak.sourceforge.net/test/latest.html) 2013-01-19 13:46:49 +00:00
Reece H. Dunn 851dfd38e5 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2013-01-19 13:23:25 +00:00
Reece H. Dunn 2c0829d6cf 1.46.30 (from http://espeak.sourceforge.net/test/latest.html) 2013-01-15 17:48:10 +00:00
Reece H. Dunn 68041d09ba Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/sl_list
	dictsource/sl_rules
	phsource/compile_report
	src/synthdata.cpp
2013-01-15 17:42:51 +00:00
Reece H. Dunn 87896196d3 Convert README to markdown. 2012-12-11 20:51:32 +00:00
Reece H. Dunn 82eefb5943 1.46.29 (from http://espeak.sourceforge.net/test/latest.html) 2012-11-30 10:39:48 +00:00
Reece H. Dunn d6bc97156f Merge branch 'upstream' into development 2012-11-30 10:35:33 +00:00
Reece H. Dunn cb988de8f9 1.46.28 (from http://espeak.sourceforge.net/test/latest.html) 2012-11-18 12:13:05 +00:00
Reece H. Dunn e694a5aea2 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_greenlandic
2012-11-18 12:06:44 +00:00
Reece H. Dunn c35cd3efe4 1.46.27 (from http://espeak.sourceforge.net/test/latest.html) 2012-10-22 18:04:43 +01:00
Reece H. Dunn 2fd60126fa Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/pt_list
	dictsource/pt_rules
	phsource/compile_report
	phsource/vowel/uu#_2
	src/synthdata.cpp
	src/translate.h
2012-10-22 17:58:19 +01:00
Reece H. Dunn d3cc69259c 1.46.26 (from http://espeak.sourceforge.net/test/latest.html) 2012-10-08 16:11:15 +01:00