bitkeeper revision 1.959.1.1 (40cdc96bIe1WZJx-cKTSpa-TOaS14w)
authormjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 14 Jun 2004 15:51:07 +0000 (15:51 +0000)
committermjw@wray-m-3.hpl.hp.com <mjw@wray-m-3.hpl.hp.com>
Mon, 14 Jun 2004 15:51:07 +0000 (15:51 +0000)
Merge xenbk@gandalf:/var/bk/xeno-unstable.bk
into wray-m-3.hpl.hp.com:/home/mjw/repos-bk/xeno-unstable.bk

1  2 
BitKeeper/etc/ignore

index cf002e46dbfa439c63a52282561c1396eca92c6b,1a7e7aea9eb817a4a1fde828ebad36f05cad169f..8db6a94aae34240015a2dd508bf398a683a24482
@@@ -1,24 -1,21 +1,26 @@@
 -BitKeeper/*/*
 -PENDING/*
 +*.a
  *.o
 +*.pyc
  *.so
  *.so.*
 -*.a
 -*.pyc
++*~
 +BitKeeper/*/*
 +PENDING/*
 +TAGS
  extras/mini-os/h/hypervisor-ifs
 +install/*
 +linux-*-xen/*
 +linux-*.tar.gz
 +linux-2.4.26-xen/*
  linux-xen-sparse
  tools/*/build/lib*/*.py
  tools/balloon/balloon
  tools/misc/miniterm/miniterm
 -tools/misc/xen_read_console
  tools/misc/xen_cpuperf
  tools/misc/xen_log
 +tools/misc/xen_read_console
++tools/xend-2004-06-10_1309.tgz
  tools/xentrace/xentrace
 -xen/xen
 -xen/xen.*
  xen/drivers/pci/classlist.h
  xen/drivers/pci/devlist.h
  xen/drivers/pci/gen-devlist