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=81cd0fafdf1de0b34ad9c1149db052222fca8fa8;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 b1fa04f..304cb09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
@@ -145,6 +147,20 @@ dev/common/libspe/trt/md/inc/cag_phonie.h
 dev/common/libspe/trt/md/src/cag_phonie.c
 dev/common/libspe/trt/md/src/dem_*.c
 
+#####################################################################
+# Rhapsody temp files
+#####################################################################
+dev/modele/rhapsody/error.log
+dev/modele/rhapsody/load.log
+dev/modele/rhapsody/silentMode.log
+dev/modele/rhapsody/store.log
+dev/modele/rhapsody/trc6500_*.rpw
+dev/modele/rhapsody/trc6500_*.ehl
+dev/modele/rhapsody/trc6500_*_rpy/filesTable.dat
+dev/modele/rhapsody/*_auto.rpy
+dev/modele/rhapsody/workspace/.metadata/*.log
+
+
 #####################################################################
 # Java build directories
 #####################################################################