Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-04-05 12:55:09 +01:00
19 changed files with 248 additions and 114 deletions
+1
View File
@@ -13,4 +13,5 @@ formant 6 100 100 100
formant 7 100 100 100
formant 8 100 100 100
consonants 100
stressAdd 10 10 0 0 0 0 -30 -30