From: Andrea Zagli <azagli@libero.it>
Date: Wed, 1 Mar 2017 14:24:52 +0000 (+0100)
Subject: Merge branch 'develop' into debian/wheezy
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=6a90d18d116faaed3f24ef60a6b353db8f1d2683;p=reptool%2Flibreptool

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

6a90d18d116faaed3f24ef60a6b353db8f1d2683
diff --cc .gitignore
index 2ab30bd,9427155..22db6e9
--- a/.gitignore
+++ b/.gitignore
@@@ -62,4 -63,5 +63,6 @@@ Rules-quo
  *.exe
  compile
  gtk-doc.m4
- build/
++build/
+ src/lexycal.yy.[ch]
 -src/rptmarshal.[ch]
++src/rptmarshal.[ch]