Merge branch 'master' into android

Conflicts:
	README.md
This commit is contained in:
Reece H. Dunn
2013-09-03 10:12:02 +01:00
4 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -250,7 +250,7 @@ endphoneme
phoneme i // optional variant of [I] for end of words
vowel starttype #i endtype #i
ipa ɪ
ipa i
length 140
IfNextVowelAppend(;)
FMT(vowel/ii_7)