Commit Graph
79 Commits
Author SHA1 Message Date
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
Reece H. Dunn 105b237951 1.46.24 (from http://espeak.sourceforge.net/test/latest.html) 2012-09-13 18:05:35 +01:00
Reece H. Dunn 631a690142 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2012-09-13 17:55:48 +01:00
Reece H. Dunn fdd88e606a Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/tn_list
	dictsource/tn_rules
	phsource/compile_report
2012-09-11 15:02:53 +01:00
Reece Dunn d8e1be9977 1.46.22 (from http://espeak.sourceforge.net/test/latest.html) 2012-08-11 13:55:55 +01:00
Reece Dunn 93aff27021 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	platforms/riscos/cpp/speak_riscos
	platforms/riscos/s/cmhgfile
2012-08-11 13:49:59 +01:00
Reece Dunn 50c70f3e10 1.46.21 (from http://espeak.sourceforge.net/test/latest.html) 2012-07-29 20:57:23 +01:00
Reece Dunn e343d33848 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/ne_list
	dictsource/ne_rules
	phsource/compile_report
2012-07-29 20:52:19 +01:00
Reece Dunn 4d1366cfbc 1.46.20 (from http://espeak.sourceforge.net/test/latest.html) 2012-07-18 10:14:51 +01:00
Reece Dunn 7fc6b58520 Merge branch 'upstream' into development
Conflicts:
	dictsource/bg_list
	dictsource/dict_phonemes
	phsource/compile_report
	platforms/windows/make_espeak.iss
2012-07-18 10:13:54 +01:00
Reece Dunn 7b7be4cf8a 1.46.19 (from http://espeak.sourceforge.net/test/latest.html) 2012-07-05 18:34:53 +01:00
Reece Dunn 32657ddf5b Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2012-07-05 18:29:35 +01:00
Reece Dunn f4da8ea6b9 1.46.18 (from espeak.sourceforge.net/test/latest.html) 2012-06-14 08:51:13 +01:00
Reece Dunn 6eabfcef6e Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/mb/mb-ee1
	espeak-data/voices/mb/mb-mx1
	espeak-data/voices/mb/mb-vz1
	phsource/compile_report
	phsource/mbrola/ee1
2012-06-14 08:44:41 +01:00
Reece Dunn 37ab9a0e33 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vowel/a_8
2012-05-10 07:00:52 +01:00
Reece Dunn d485152451 Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	dictsource/ta_rules
	phsource/compile_report
2012-04-16 20:32:22 +01:00
Reece Dunn bc2f90455f 1.46.15 2012-04-08 09:44:25 +01:00
Reece Dunn 662e161d13 1.46.14 2012-02-22 19:07:04 +00:00
Reece Dunn 17be838b1a 1.46.13 2012-01-15 09:59:53 +00:00
Reece Dunn c43dddfeeb Merge branch 'upstream' into development
Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
2012-01-06 18:37:07 +00:00
Reece Dunn 812bd35f73 1.46.11 2011-12-31 15:56:27 +00:00
Reece Dunn 4e0dccc4b9 Remove the phsource/error_intonation file (build output). 2011-12-27 10:53:39 +00:00
Reece Dunn 16ca03220a remove files generated by 'espeakedit --compile' 2011-12-26 20:26:21 +00:00
Reece Dunn 7510450b25 Merge branch 'upstream' into development 2011-12-22 11:44:06 +00:00
Reece Dunn 5c06650486 1.46.09 2011-12-17 08:13:34 +00:00
Reece Dunn 5cd9f9217e remove a file added by mistake 2011-12-02 08:19:46 +00:00
Reece Dunn 1d07e97816 1.46.06 2011-11-29 23:31:13 +00:00
Reece Dunn 0dfb6627df Merge branch 'master' into development
Conflicts:
	dictsource/am_list
	phsource/ufric/s_pal.wav
2011-11-29 23:21:17 +00:00
Reece Dunn 4eff8623d5 1.46.01 2011-11-23 22:15:29 +00:00
Reece Dunn fa131df13e 1.45.49 2011-11-23 21:31:16 +00:00
Reece Dunn f8cab9250f espeak 1.45.48 2011-11-18 08:47:50 +00:00
Reece Dunn 20de292bb9 add a .gitignore file to ignore unneeded files from development releases 2011-11-18 08:47:08 +00:00
Reece Dunn 75cddbde96 Merge branch 'master' into development 2011-10-29 10:34:21 +01:00
Reece Dunn 922139f25f 1.45.46 2011-10-15 23:07:48 +01:00
Reece Dunn 75c6fae090 Merge branch 'master' into development 2011-10-15 22:48:46 +01:00
Reece Dunn e17f413eab added a README 2011-10-08 16:15:20 +01:00
Reece Dunn f0cf914a15 1.45.44 -- from the espeak and espeakedit zip file sources 2011-09-17 16:31:41 +01:00