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
+3 -3
View File
@@ -1,4 +1,4 @@
// Pronounciation rule for Bengali.
// Pronounciation rule for Bengali.
// Improvement input by Him Prasad Gautam (Nepal).
// This file is UTF8 encoded
@@ -137,9 +137,8 @@
.group ৌ
C) ৌ ow
C) ৌঁ o~w
.group ৺
৺ (C iSSor
৺(C iSSor
@@ -405,3 +404,4 @@
__) - (_D bij'og
D_) - (_D bij'og