Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/fa-en-us
	phsource/compile_report
	phsource/mbrola/ir1
This commit is contained in:
Reece H. Dunn
2014-08-09 13:10:22 +01:00
26 changed files with 1254 additions and 458 deletions
+2
View File
@@ -49,3 +49,5 @@
4 t VWL 0 t_h
4 k VWL 0 k_h
0 t2 NULL 0 t
0 ? NULL 0 t
0 n- NULL 0 n
+2
View File
@@ -46,5 +46,7 @@
0 i@ NULL 50 I @
0 i@3 NULL 60 i r
0 t2 NULL 0 t
0 ? NULL 0 t
0 n- NULL 0 n