From: Andrea Zagli <azagli@libero.it>
Date: Sun, 21 May 2017 08:48:17 +0000 (+0200)
Subject: Merge branch 'develop' into debian/sid
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=a6dfb77d9c7592a4146239f5adf90e76b5607bda;p=zakform%2Flibzakform

Merge branch 'develop' into debian/sid
---

a6dfb77d9c7592a4146239f5adf90e76b5607bda
diff --cc .gitignore
index 6f00395,6fce3bf..b170835
--- a/.gitignore
+++ b/.gitignore
@@@ -50,4 -50,4 +50,5 @@@ intltool-
  Rules-quot
  *.exe
  *.csv
- build/
 -src/*marshal*.[ch]
++src/*marshal*.[ch]
++build/