Merge branch 'master' into mcb-tcp-xfer

2007-06-09 22:58:27 +01:00 · 2007-06-09 22:58:27 +01:00 · 11ec23f454
parent 6835755350 f7b4b77c2e
commit 11ec23f454
6 changed files with 2 additions and 0 deletions
--- a/contrib/bochs/.gitignore
+++ b/contrib/bochs/.gitignore
@ -3,3 +3,5 @@ parport.out
 ne2k-tx.log
 ne2k-txdump.txt
 tunctl
+bochs
+qemu
--- a/src/.gitignore
+++ b/src/.gitignore
--- a/src/bin/.gitignore
+++ b/src/bin/.gitignore
--- a/src/config/.gitignore
+++ b/src/config/.gitignore
--- a/src/include/.gitignore
+++ b/src/include/.gitignore
--- a/src/util/.gitignore
+++ b/src/util/.gitignore