From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Fri, 4 Jul 2014 12:17:33 +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~68
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=18348f084bcb9464cd33c0bb2a5df69215fd0e51;hp=50ea04f8401b9774d9ba728b9dc60d182bb358b3;p=debian6500.git

Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_invalid_track_monres with PLOT_T messages size increasing
impacts dependances on libmiso/libgonext/Xgon/Gonext/Monitoring
Conflicts:
	dev/common/libhrgonio/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_gon/XGon/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_gon/XGon/src/Version.cpp
	dev/modele/implementation/trc6500_chaine_sup/SupCapteur/CHANGELOG.txt
Correcs ITRSOI dependances
---

diff --git a/.gitignore b/.gitignore
index 5245145..304cb09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 config.log
 prod
 prod_rhp*
+
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
@@ -10,6 +14,7 @@ prod_rhp*
 *.pyc
 *.o
 *.os
+*.orig
 .*project
 .settings