Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
This commit is contained in:
Reece H. Dunn
2013-01-19 13:23:25 +00:00
20 changed files with 11836 additions and 40 deletions
+1 -2
View File
@@ -26,6 +26,7 @@
.group e
e e
e (_ E // ??
_) e E
.group f
@@ -45,7 +46,6 @@
.group i
i i
i (A j
i (r j
.group j
@@ -119,7 +119,6 @@
.group u
u u
u (A w
u (r u
A) u (K w