Soft'N'Design Software / projects / debian6500.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: cd8225a)
DCR860 : corrects interface hrgonio evolution impacts new release 0.10.0
authorNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 10:38:19 +0000 (12:38 +0200)
committerNiry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Fri, 4 Jul 2014 10:38:19 +0000 (12:38 +0200)
         updates .deb dependances

.gitignore patch | blob | blame | history

diff --git a/.gitignore b/.gitignore
index 5b16382834d10bfe74365446cde3f127f082cb6a..87a360b8f81bc16a7c6d47e0976a96e2969866a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
Debian distribution for TRC6500