Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vowel/a_8
This commit is contained in:
Reece Dunn
2012-05-10 07:00:52 +01:00
9 changed files with 106 additions and 23 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
phoneme t2 // [t] which doesn't reduce
import_phoneme base/t
vcd alv stop
ChangePhoneme(t)
endphoneme
+4
View File
@@ -388,3 +388,7 @@ phoneme t
WAV(ustop/t, 90)
endphoneme
phoneme t2 // [t] which doesn't reduce
import_phoneme base/t
endphoneme