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
This commit is contained in:
Reece H. Dunn
2013-03-18 11:54:58 +00:00
2 changed files with 0 additions and 12 deletions
-7
View File
@@ -1,7 +0,0 @@
name nahuatl - classical
language nci
gender male
intonation 3
stressrule 2
stressLength 190 190 200 200 0 0 220 240
-5
View File
@@ -1,5 +0,0 @@
name papiamento-test
language pap
phonemes base2