Merge branch 'i5651' into next · nvaccess/nvda@40754f4

Commit

Merge branch 'i5651' into next

Browse files

michaelDCurran committed Jan 15, 2016

2 parents 8ab63c2 + 4c9abd5 commit 40754f4

+3 −3		Makefile.am
+6 −0		README.md
+470 −0		src/compat/getopt.c
+24 −79		src/espeak-ng.c
+49 −0		src/include/compat/getopt.h
+8 −9		src/libespeak-ng/compiledata.c
+5 −3		src/libespeak-ng/dictionary.c
+4 −0		src/libespeak-ng/error.c
+12 −8		src/libespeak-ng/spect.c
+8 −4		src/libespeak-ng/speech.c
+1 −1		src/libespeak-ng/speech.h
+3 −1		src/libespeak-ng/synth_mbrola.c
+0 −2		src/libespeak-ng/synthdata.c
+1 −3		src/libespeak-ng/synthesize.h
+4 −1		src/libespeak-ng/voices.c
+4 −3		src/libespeak-ng/wavegen.c
+0 −64		src/speak-ng.c
+303 −0		src/windows/data.vcxproj
+2 −0		src/windows/data.vcxproj.filters
+13 −0		src/windows/espeak-ng.sln
+6 −4		src/windows/espeak-ng.vcxproj
+12 −0		src/windows/espeak-ng.vcxproj.filters
+4 −4		src/windows/libespeak-ng.vcxproj