Merge branch 'development' into LTS_development

This commit is contained in:
Thulinma 2017-06-19 20:24:16 +02:00
commit a2d912912f

1
.gitignore vendored
View file

@ -7,6 +7,7 @@
*.bak *.bak
*~ *~
.deps .deps
generated/
Makefile.in Makefile.in
Makefile Makefile
version.m4 version.m4