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

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

diff --git a/.gitignore b/.gitignore
index 524514587707eef83a80e27387d26ce47af90dda..304cb09c0691598ae58cd525f8d31d7a84b40d28 100644 (file)
--- 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