diff options
| author | Michael Brown | 2007-06-09 23:58:27 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-06-09 23:58:27 +0200 |
| commit | 11ec23f454968965dc5310b154b43a8f2995a8bf (patch) | |
| tree | 85d5739f275d94983a3e47004968d88010134dbe | |
| parent | Merge branch 'master' into mcb-tcp-xfer (diff) | |
| parent | Ignore external directories (bochs, qemu) within contrib/bochs. (diff) | |
| download | ipxe-11ec23f454968965dc5310b154b43a8f2995a8bf.tar.gz ipxe-11ec23f454968965dc5310b154b43a8f2995a8bf.tar.xz ipxe-11ec23f454968965dc5310b154b43a8f2995a8bf.zip | |
Merge branch 'master' into mcb-tcp-xfer
| -rw-r--r-- | contrib/bochs/.gitignore (renamed from contrib/bochs/.cvsignore) | 2 | ||||
| -rw-r--r-- | src/.gitignore (renamed from src/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/bin/.gitignore (renamed from src/bin/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/config/.gitignore (renamed from src/config/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/include/.gitignore (renamed from src/include/.cvsignore) | 0 | ||||
| -rw-r--r-- | src/util/.gitignore (renamed from src/util/.cvsignore) | 0 |
6 files changed, 2 insertions, 0 deletions
diff --git a/contrib/bochs/.cvsignore b/contrib/bochs/.gitignore index a5a930a3e..4e8f81ab3 100644 --- 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 index ef29930b6..ef29930b6 100644 --- a/src/.cvsignore +++ b/src/.gitignore diff --git a/src/bin/.cvsignore b/src/bin/.gitignore index 72e8ffc0d..72e8ffc0d 100644 --- a/src/bin/.cvsignore +++ b/src/bin/.gitignore diff --git a/src/config/.cvsignore b/src/config/.gitignore index 499ae1229..499ae1229 100644 --- a/src/config/.cvsignore +++ b/src/config/.gitignore diff --git a/src/include/.cvsignore b/src/include/.gitignore index de1598ef3..de1598ef3 100644 --- a/src/include/.cvsignore +++ b/src/include/.gitignore diff --git a/src/util/.cvsignore b/src/util/.gitignore index 18ce7e23d..18ce7e23d 100644 --- a/src/util/.cvsignore +++ b/src/util/.gitignore |