Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-03-07 10:54:25 +00:00
19 changed files with 2287 additions and 1384 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ int LookupMnem(MNEM_TAB *table, const char *string);
#define N_PATH_HOME 220
#define N_PATH_HOME 230
extern char path_home[N_PATH_HOME]; // this is the espeak-data directory
extern void strncpy0(char *to,const char *from, int size);