Merge tag '1.48.11' into android

espeak 1.48.11

Conflicts:
	Makefile.am
This commit is contained in:
Reece H. Dunn
2014-10-28 12:59:53 +00:00
77 changed files with 1400 additions and 788 deletions
+1
View File
@@ -97,6 +97,7 @@ espeak-data/config
espeak-data/dictsource
espeak-data/phsource
espeak-data/*_dict
espeak-data/mbrola_ph/*_phtrans
espeak-data/intonations
espeak-data/phondata
espeak-data/phondata-manifest