Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile.in
This commit is contained in:
neo committed 2015-05-27 10:41:33 +09:00
commit 9344d41ac5
13 files changed
+1169 -356

No files matched your search

+4
View File
@@ -0,0 +1,4 @@
aclocal -I m4
autoheader -f
automake -f
autoconf -f