Merge branch 'master' into pu/mp

This commit is contained in:
svenhoefer
2017-03-14 08:06:05 +01:00
3 changed files with 5 additions and 13 deletions

1
.gitignore vendored
View File

@@ -3,6 +3,7 @@ Makefile
autom4te.cache
*.in
aclocal.m4
compile
config.*
configure
depcomp