Merge branch 'master' into android

Conflicts:
	Makefile.am
	README.md
This commit is contained in:
Reece H. Dunn
2013-09-13 16:55:56 +01:00
7 changed files with 103 additions and 215 deletions
+7
View File
@@ -5,6 +5,7 @@
# intermediate build output:
*.o
*.lo
# android build output:
@@ -34,24 +35,30 @@ INSTALL
NEWS
README
.deps/
.libs/
Makefile
Makefile.in
aclocal.m4
autom4te.cache/
config.*
configure
depcomp
install-sh
libtool
ltmain.sh
m4/
missing
stamp-h1
.dirstamp
# libraries
docs/speak_lib.h
libespeak.a
libespeak.la
libespeak.so*
# programs