Merge commit 'e4854a9cd6' into android

Conflicts:
	src/voices.cpp
This commit is contained in:
Reece H. Dunn
2013-03-13 20:55:49 +00:00
38 changed files with 1442 additions and 1169 deletions
+2
View File
@@ -3382,6 +3382,8 @@ if((c == '/') && (tr->langopts.testing & 2) && IsDigit09(next_in) && IsAlpha(pre
}
MakePhonemeList(tr, clause_pause, new_sentence);
phoneme_list[N_PHONEME_LIST].ph = NULL; // recognize end of phoneme_list array, in Generate()
phoneme_list[N_PHONEME_LIST].sourceix = 1;
if(embedded_count) // ???? is this needed
{