From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Thu, 3 Jul 2014 14:39:14 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva... 
X-Git-Tag: debian_7.5_20141208~69
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=81cd0fafdf1de0b34ad9c1149db052222fca8fa8;hp=94e1e9cb5c1e83840f4e2d38e6f2d25115fb1998;p=debian6500.git

Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres

Conflicts:
	dev/common/libhrgonio/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_sup/SupBlade/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_sup/SupProdData/CHANGELOG.txt
---

diff --git a/.gitignore b/.gitignore
index 5b16382..b1fa04f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,17 @@
 config.log
 prod
 prod_rhp*
+
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
 *.pyc
 *.o
 *.os
+*.orig
 .*project
 .settings