Merge branch 'master' into mcb-tcp-xfer

diff --git a/contrib/bochs/.cvsignore b/contrib/bochs/.gitignore
similarity index 84%
rename from contrib/bochs/.cvsignore
rename to contrib/bochs/.gitignore
index a5a930a..4e8f81a 100644 (file)
--- a/contrib/bochs/.cvsignore
+++ b/contrib/bochs/.gitignore
@@ -3,3 +3,5 @@ parport.out
 ne2k-tx.log
 ne2k-txdump.txt
 tunctl
+bochs
+qemu

diff --git a/src/.cvsignore b/src/.gitignore
similarity index 100%
rename from src/.cvsignore
rename to src/.gitignore

diff --git a/src/bin/.cvsignore b/src/bin/.gitignore
similarity index 100%
rename from src/bin/.cvsignore
rename to src/bin/.gitignore

diff --git a/src/config/.cvsignore b/src/config/.gitignore
similarity index 100%
rename from src/config/.cvsignore
rename to src/config/.gitignore

diff --git a/src/include/.cvsignore b/src/include/.gitignore
similarity index 100%
rename from src/include/.cvsignore
rename to src/include/.gitignore

diff --git a/src/util/.cvsignore b/src/util/.gitignore
similarity index 100%
rename from src/util/.cvsignore
rename to src/util/.gitignore