Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	platforms/riscos/cpp/speak_riscos
	platforms/riscos/s/cmhgfile
This commit is contained in:
Reece Dunn
2012-08-11 13:49:59 +01:00
21 changed files with 320 additions and 67 deletions
@@ -41,6 +41,8 @@
//#define USE_NANOSLEEP
#define INCLUDE_KLATT
#define INCLUDE_MBROLA
#define INCLUDE_SONIC
// will look for espeak_data directory here, and also in user's home directory
#define PATH_ESPEAK_DATA "/usr/share/espeak-data"