Merge branch 'master' into android

Conflicts:
	README.md
This commit is contained in:
Reece H. Dunn
2013-09-25 08:57:56 +01:00
55 changed files with 3266 additions and 564 deletions
+1
View File
@@ -42,6 +42,7 @@ Makefile
Makefile.in
aclocal.m4
autom4te.cache/
compile
config.*
configure
depcomp