diff options
| author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-28 21:51:31 +0000 |
|---|---|---|
| committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-03-28 21:51:31 +0000 |
| commit | 1edbd64aa750fb8996b3731cc88b86d805a0dbbf (patch) | |
| tree | 951cf62742f54484bb828a8ac1679c11c6c24379 /BitKeeper | |
| parent | e3df341411185acc5012a88c96b78c8acda3555d (diff) | |
| parent | 5daacba8059a5f77d126b900abda24048229b8a5 (diff) | |
| download | xen-1edbd64aa750fb8996b3731cc88b86d805a0dbbf.tar.gz xen-1edbd64aa750fb8996b3731cc88b86d805a0dbbf.tar.bz2 xen-1edbd64aa750fb8996b3731cc88b86d805a0dbbf.zip | |
bitkeeper revision 1.1236.1.146 (42487c63RNAgA2iD3MzC_827ws4_gA)
merge
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/ignore | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore index 1d370131c1..0319994826 100644 --- a/BitKeeper/etc/ignore +++ b/BitKeeper/etc/ignore @@ -44,12 +44,14 @@ docs/user/internals.pl docs/user/labels.pl docs/user/user.css docs/user/user.html +extras/mini-os/h/hypervisor-ifs extras/mini-os/h/xen-public extras/mini-os/mini-os.* install/* linux-*-xen0/* linux-*-xenU/* linux-*.patch +linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh linux-xen-sparse mkddbxen netbsd-*-tools/* @@ -61,14 +63,38 @@ patches/ebtables.diff patches/tmp/* pristine-* tools/*/build/lib*/*.py +tools/Makefile.smh tools/balloon/balloon +tools/blktap/Makefile.smh +tools/blktap/blkcow +tools/blktap/blkcowgnbd +tools/blktap/blkcowimg +tools/blktap/blkdump +tools/blktap/blkgnbd +tools/blktap/blkimg +tools/blktap/blockstore.dat +tools/blktap/blockstored +tools/blktap/bstest +tools/blktap/parallax +tools/blktap/vdi.dot +tools/blktap/vdi.ps +tools/blktap/vdi_create +tools/blktap/vdi_fill +tools/blktap/vdi_list +tools/blktap/vdi_snap +tools/blktap/vdi_snap_list +tools/blktap/vdi_tree +tools/blktap/vdi_validate +tools/blktap/xen/* tools/check/.* +tools/cmdline/* tools/cmdline/xen/* tools/ioemu/iodev/device-model tools/libxc/xen/* tools/misc/miniterm/miniterm tools/misc/xen_cpuperf tools/misc/xenperf +tools/tests/test_x86_emulator tools/vnet/gc tools/vnet/gc*/* tools/vnet/vnet-module/*.ko @@ -83,6 +109,7 @@ tools/xcs/xcsdump tools/xentrace/xentrace tools/xfrd/xfrd xen/BLOG +xen/TAGS xen/arch/x86/asm-offsets.s xen/arch/x86/boot/mkelf32 xen/ddb/* @@ -92,37 +119,14 @@ xen/drivers/pci/gen-devlist xen/figlet/figlet xen/include/asm xen/include/asm-*/asm-offsets.h +xen/include/hypervisor-ifs/arch xen/include/public/public xen/include/xen/*.new xen/include/xen/banner.h xen/include/xen/compile.h +xen/tags xen/tools/elf-reloc xen/tools/figlet/figlet xen/xen xen/xen-syms xen/xen.* -linux-2.6.10-xen-sparse/include/asm-xen/hypervisor.h.smh -tools/Makefile.smh -tools/blktap/Makefile.smh -tools/blktap/blkcow -tools/blktap/blkcowgnbd -tools/blktap/blkcowimg -tools/blktap/blkdump -tools/blktap/blkgnbd -tools/blktap/blkimg -tools/blktap/blockstore.dat -tools/blktap/parallax -tools/blktap/vdi.dot -tools/blktap/vdi.ps -tools/blktap/vdi_create -tools/blktap/vdi_fill -tools/blktap/vdi_list -tools/blktap/vdi_snap -tools/blktap/vdi_snap_list -tools/blktap/vdi_tree -tools/blktap/vdi_validate -tools/blktap/xen/* -tools/cmdline/* -tools/tests/test_x86_emulator -tools/blktap/blockstored -tools/blktap/bstest |