Merge branch 'development'

Conflicts:
	phsource/phonemes
	src/Makefile
This commit is contained in:
Reece H. Dunn
2014-05-23 17:16:17 +01:00
55 changed files with 3193 additions and 1092 deletions
+5
View File
@@ -122,6 +122,7 @@ static keywtab_t k_properties[] = {
{"isNasal", 0, phNASAL},
{"isLiquid", 0, phLIQUID},
{"isUStop", 0, phSTOP},
{"isVStop", 0, phVSTOP},
{"isVFricative", 0, phVFRICATIVE},
{"isPalatal", 0, i_isPalatal},
@@ -3499,6 +3500,10 @@ static void CompilePhonemeFiles()
strncpy0(current_fname,item_string,sizeof(current_fname));
linenum = 1;
}
else
{
error("Missing file: %s", item_string);
}
break;
case kPHONEMETABLE: