Merge branch 'upstream' into development

Browse Source

Conflicts:
	dictsource/dict_phonemes
	espeak-data/voices/asia/ms
	phsource/compile_report

...

This commit is contained in:

Reece H. Dunn

2013-04-24 12:33:33 +01:00

parent 81cda039f3 93cc76768c

commit ac45bd4e80

34 changed files with 1069 additions and 545 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/vdiph/ooi

BIN

Binary file not shown.

phsource/vdiph/ooi_2

BIN

Binary file not shown.

phsource/vdiph/ooi_3

BIN

Binary file not shown.

phsource/vdiph/ooi_4

BIN

Binary file not shown.