Merge tag 'upstream/0.10.7+git20150512'
authorSophie Brun <sophie@freexian.com>
Tue, 12 May 2015 10:01:49 +0000 (12:01 +0200)
committerSophie Brun <sophie@freexian.com>
Tue, 12 May 2015 10:01:49 +0000 (12:01 +0200)
Upstream version 0.10.7+git20150512

Conflicts:
.gitignore

1  2 
.gitignore

diff --cc .gitignore
@@@ -1,1 -1,23 +1,23 @@@
 -
 +.pc
+ INSTALL
+ Makefile
+ Makefile.in
+ aclocal.m4
+ autom4te.cache/
+ config.h
+ config.h.in
+ config.log
+ config.status
+ configure
+ compile
+ depcomp
+ install-sh
+ missing
+ src/*.lo
+ src/*.o
+ src/.deps/
+ src/Makefile
+ src/Makefile.in
+ src/mfoc
+ src/mfoc.exe
+ stamp-h1