Merge remote-tracking branch 'origin/dev_tr65_aca_882_pb_evf_terrain' into int_tr65_n...

[debian6500.git] / .gitignore

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