correct mediatray actions

[debian6500.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 210664f942ba91bcd06ae7bf1a0f6540f0aae933..93cfeff1451161777fcb0ac6b741195ac11a49b4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,12 +4,10 @@
 *~
 *.contrib*
 *.keep
-*.orig
 *.merge
 *.pyc
 *.o
 *.os
-*.orig
 .*project
 .settings
 *.iso
@@ -19,3 +17,4 @@ simple-cdd/dists/
 simple-cdd/images/
 
 trc6500-master-file/deb
+master/etc/trc6500_os_version