Merge remote-tracking branch 'origin/int_tr65_nra_2.3.3' into dev_tr65_aca_913_correc...

[debian6500.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a63dd0d7ca74fcf95ce29ed3460796515fbaf330..304cb09c0691598ae58cd525f8d31d7a84b40d28 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,19 @@
 config.log
 prod
 prod_rhp*
+
+#####################################################################
+# Temp/IDE generated files
+#####################################################################
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
+*.orig
 .*project
 .settings