Reece H. Dunn ac45bd4e80 Merge branch 'upstream' into development ...

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

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

..

!v

Merge branch 'upstream' into development

2013-04-05 12:55:09 +01:00

asia

Merge branch 'upstream' into development

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

europe

Merge branch 'upstream' into development

2013-04-16 08:49:57 +01:00

mb

1.46.31 (from http://espeak.sourceforge.net/test/latest.html)

2013-01-19 13:46:49 +00:00

other

Merge branch 'upstream' into development

2013-04-11 10:15:49 +01:00

test

1.47.03f (from http://espeak.sourceforge.net/test/latest.html)

2013-04-01 00:42:55 +01:00

de

1.45.44 -- from the espeak and espeakedit zip file sources

2011-09-17 16:31:41 +01:00

default

Change layout of espeak-data/voices

2013-03-18 04:11:25 +00:00

en

Merge branch 'upstream' into development

2013-04-01 00:37:36 +01:00

en-us

Merge branch 'upstream' into development

2013-03-29 12:09:33 +00:00

es-la

Merge branch 'upstream' into development

2013-04-01 00:37:36 +01:00

fr

Merge branch 'master' into development

2011-10-29 10:34:21 +01:00

pt

Merge branch 'upstream' into development

2013-04-16 08:49:57 +01:00