Conflicts:
	espeak-data/voices/asia/fa
	espeak-data/voices/asia/fa-pin
	espeak-data/voices/asia/ka
	espeak-data/voices/asia/ne
	espeak-data/voices/asia/pa
	espeak-data/voices/asia/vi-hue
	espeak-data/voices/europe/an
	espeak-data/voices/europe/bg
	espeak-data/voices/europe/et
	espeak-data/voices/europe/ga
	espeak-data/voices/europe/lt

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vdiph/eei_5
	phsource/vdiph2/i@_3
	phsource/vietnam/_c.wav
	phsource/vietnam/a
	phsource/vietnam/ch.wav
	phsource/vietnam/dd.wav
	phsource/vietnam/ie_2
	phsource/vietnam/oe
	phsource/vietnam/th.wav
	phsource/vietnam/tr.wav
	platforms/windows/make_espeakedit.iss
	src/Makefile

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@327 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@326 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@325 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@324 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@323 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@322 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@321 d46cf337-b52f-0410-862d-fd96e6ae7743

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@320 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vnasal/a#_n2
	phsource/vnasal/o_n4

espeakedit, show path to phsource when compiling.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@319 d46cf337-b52f-0410-862d-fd96e6ae7743

klatt voices, Added nasal formant value to nasal vowels.
Fixed bug: speaking "hyphen" between two words with $combine attribute.
Language changes: an, pt, ta.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@318 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Language changes: da.
Fixed crash bug (in lang=hi), affects prevVowel(), isFirstVowel, etc in phoneme definitions.



git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@317 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	docs/speak_lib.h

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Language changes: an, pt, ta.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@316 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	docs/speak_lib.h

Fix: character names sometimes not spoken correctly if they are from another language's dictionary.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@315 d46cf337-b52f-0410-862d-fd96e6ae7743

The TTS engine should be destroyed in the onStop method, not the
onDestroy method to prevent it being used in the stopped state.

Conflicts:
	phsource/vowel/vowelchart.png

Conflicts:
	src/voices.cpp

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Language change: pt.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@314 d46cf337-b52f-0410-862d-fd96e6ae7743

Conflicts:
	src/Makefile.espeakedit
	src/speech.h

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

Fix bug in SAPI5 version: speed suddenly changes to very slow when speaking a word which contains foreign characters.
Language changes: da, fa, hu, pt, ur.


git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@313 d46cf337-b52f-0410-862d-fd96e6ae7743