Merge branch 'master' into mcb-tcp-xfer
authorMichael Brown <mcb30@etherboot.org>
Sat, 9 Jun 2007 21:58:27 +0000 (22:58 +0100)
committerMichael Brown <mcb30@etherboot.org>
Sat, 9 Jun 2007 21:58:27 +0000 (22:58 +0100)
contrib/bochs/.gitignore [moved from contrib/bochs/.cvsignore with 84% similarity]
src/.gitignore [moved from src/.cvsignore with 100% similarity]
src/bin/.gitignore [moved from src/bin/.cvsignore with 100% similarity]
src/config/.gitignore [moved from src/config/.cvsignore with 100% similarity]
src/include/.gitignore [moved from src/include/.cvsignore with 100% similarity]
src/util/.gitignore [moved from src/util/.cvsignore with 100% similarity]

similarity index 84%
rename from contrib/bochs/.cvsignore
rename to contrib/bochs/.gitignore
index a5a930a..4e8f81a 100644 (file)
@@ -3,3 +3,5 @@ parport.out
 ne2k-tx.log
 ne2k-txdump.txt
 tunctl
+bochs
+qemu
similarity index 100%
rename from src/.cvsignore
rename to src/.gitignore
similarity index 100%
rename from src/bin/.cvsignore
rename to src/bin/.gitignore
similarity index 100%
rename from src/config/.cvsignore
rename to src/config/.gitignore
similarity index 100%
rename from src/util/.cvsignore
rename to src/util/.gitignore