Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece Dunn
2012-01-06 18:37:07 +00:00
17 changed files with 215 additions and 56 deletions
+1 -1
View File
@@ -314,7 +314,7 @@ phoneme r // used for [r] when not preceding a vowel
FMT(r3/r_) addWav(r3/rx)
endphoneme
phoneme k // tasasemad klõklsud
phoneme k // tasasemad kl�klsud
vls vel stop
lengthmod 2
voicingswitch g
Binary file not shown.