Merge commit '4634aa43a5' into development

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
This commit is contained in:
Reece H. Dunn
2013-03-18 11:43:32 +00:00
18 changed files with 406 additions and 58 deletions
@@ -30,6 +30,7 @@
#define __WIN32__
#define NEED_WCSTOF
#define NEED_GETOPT
#define USE_MBROLA_LIB
#define PATHSEP '\\'
#define USE_PORTAUDIO