Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-03-21 14:42:57 +00:00
25 changed files with 229 additions and 126 deletions
+3 -3
View File
@@ -342,12 +342,12 @@ endphoneme
phoneme iR
phoneme iR // TEST "vier" = [f'iR] not successful
vowel starttype #i endtype #@
ipa iɐ
flag1
length 180
FMT(vdiph2/i@_2)
length 230
FMT(vdiph2/i@_3)
endphoneme