Merge branch 'master' into build

Browse Source

Conflicts:
	src/Makefile.espeakedit

...

This commit is contained in:

Reece Dunn

2010-06-28 21:08:08 +01:00

parent 29f50d6560 a9fedd94db

commit 6798e206c3

92 changed files with 3437 additions and 2434 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/r3/r_ru.wav

BIN

Binary file not shown.

phsource/r3/r_ru2

BIN

Binary file not shown.