Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/ms
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-04-24 12:33:33 +01:00
34 changed files with 1069 additions and 545 deletions
+6
View File
@@ -0,0 +1,6 @@
name Korean
language ko
gender male
pitch 80 118
intonation 2
+12
View File
@@ -0,0 +1,12 @@
name vietnam_sgn
language vi-sgn
phonemes vi-sgn
dictrules 2
gender male
words 1
pitch 82 118 //80 118
//breath 75 75 60 40 15 10
//breathw 150 150 200 200 400 400
voicing 90 //18
flutter 20