Merge branch 'develop' into debian/sid

author Andrea Zagli <azagli@libero.it>

Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)

committer Andrea Zagli <azagli@libero.it>

Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)
author Andrea Zagli <azagli@libero.it>
Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)
committer Andrea Zagli <azagli@libero.it>
Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)
diff --cc .gitignore

index 6f0039519e176f797529c84f6082a95badd535c5,6fce3bf6af947f368c13f7d1aee5914b08a9b248..b1708355c55d5164868d7049ad11a1794215fbc9
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -50,4 -50,4 +50,5 @@@ intltool-
   Rules-quot
   *.exe
   *.csv
- build/
- -src/*marshal*.[ch]
++src/*marshal*.[ch]
++build/
author	Andrea Zagli <azagli@libero.it>
	Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)
committer	Andrea Zagli <azagli@libero.it>
	Sun, 21 May 2017 08:48:17 +0000 (10:48 +0200)