Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_sinhala
	phsource/ph_urdu
	platforms/windows/make_espeak.iss
	platforms/windows/make_espeakedit.iss
This commit is contained in:
Reece H. Dunn
2013-04-02 17:31:25 +01:00
13 changed files with 232 additions and 90 deletions
+8 -9
View File
@@ -1878,17 +1878,20 @@ include ph_greenlandic
phonemetable am base
include ph_amhari
phonemetable si hi
include ph_sinhala
//**************************************************************************************
// The following lines are experimental, for future additions.
// These langauges are not in a usable state.
// These lines can be deleted.
phonemetable rw base2
include ph_kinyarwanda
phonemetable si hi
include ph_sinhala
phonemetable sl sk
include ph_slovenian
//phonemetable rw base2
//include ph_kinyarwanda
//phonemetable mr hi
//include ph_marathi
@@ -1902,9 +1905,6 @@ include ph_kinyarwanda
//phonemetable prs base
//include ph_dari
phonemetable sl sk
include ph_slovenian
//phonemetable gd base
//include ph_s_gaelic
@@ -1929,7 +1929,6 @@ include ph_slovenian
//phonemetable tn base
//include ph_setswana
//phonemetable mt base
//include ph_maltese