Merge remote-tracking branch 'origin/master'

Browse Source

olins/espeak-ng

Conflicts:
	docs/add_language.md
	docs/languages.md

Conflicts:
	docs/add_language.md
	docs/languages.md

Conflicts:
	docs/add_language.md
	docs/languages.md

...

This commit is contained in:

Valdis Vitolins

2015-12-28 17:25:37 +02:00

parent 5d295bdd30 0c8fe52025

commit 030b147767

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

Diff Content Not Available