Merge branch 'upstream' into development

Browse Source

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/vnasal/a#_n2
	phsource/vnasal/o_n4

...

This commit is contained in:

Reece H. Dunn

2013-03-17 00:51:22 +00:00

parent b51fe6f892 42028ac8ce

commit 790c151a4d

46 changed files with 134 additions and 79 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

phsource/klatt/nr

BIN

Binary file not shown.

phsource/vnasal/&_n

BIN

Binary file not shown.

phsource/vnasal/&u_n

BIN

Binary file not shown.

phsource/vnasal/V_n

BIN

Binary file not shown.

phsource/vnasal/W_n

BIN

Binary file not shown.

phsource/vnasal/a#_n

BIN

Binary file not shown.

phsource/vnasal/a#u_n

BIN

Binary file not shown.

phsource/vnasal/aa_n

BIN

Binary file not shown.

phsource/vnasal/aa_n2

BIN

Binary file not shown.

phsource/vnasal/aa_n3

BIN

Binary file not shown.

phsource/vnasal/aa_n4

BIN

Binary file not shown.

phsource/vnasal/e#_n

BIN

Binary file not shown.

phsource/vnasal/e_n

BIN

Binary file not shown.

phsource/vnasal/ee_n

BIN

Binary file not shown.

phsource/vnasal/ee_n2

BIN

Binary file not shown.

phsource/vnasal/ee_u_n

BIN

Binary file not shown.

phsource/vnasal/i_n

BIN

Binary file not shown.

phsource/vnasal/i_n2

BIN

Binary file not shown.

phsource/vnasal/ii_n

BIN

Binary file not shown.

phsource/vnasal/o_n

BIN

Binary file not shown.

phsource/vnasal/o_n2

BIN

Binary file not shown.

phsource/vnasal/o_n3

BIN

Binary file not shown.

phsource/vnasal/oi_n

BIN

Binary file not shown.

phsource/vnasal/oo_n

BIN

Binary file not shown.

phsource/vnasal/oo_n2

BIN

Binary file not shown.

phsource/vnasal/oo_n3

BIN

Binary file not shown.

phsource/vnasal/u_n

BIN

Binary file not shown.

phsource/vnasal/vowelchart.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 28 KiB