From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Fri, 4 Jul 2014 10:38:19 +0000 (+0200)
Subject: DCR860 : corrects interface hrgonio evolution impacts new release 0.10.0
X-Git-Tag: debian_7.5_20141208~68^2~1
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=3db33d420266c30a058d2a22b2a4d7d74cfe5c98;hp=cd8225a9e0a574f347a476e57151c2c689a66887;p=debian6500.git

DCR860 : corrects interface hrgonio evolution impacts new release 0.10.0
         updates .deb dependances
---

diff --git a/.gitignore b/.gitignore
index 5b16382..87a360b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os