Merge branch 'master' into android

Conflicts:
	platforms/windows/make_espeakedit.iss
This commit is contained in:
Reece H. Dunn
2013-03-26 02:59:43 +00:00
95 changed files with 2765 additions and 5014 deletions
BIN
View File
Binary file not shown.
Binary file not shown.