aboutsummaryrefslogtreecommitdiffstats
path: root/BitKeeper
diff options
context:
space:
mode:
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2004-06-11 22:04:24 +0000
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>2004-06-11 22:04:24 +0000
commitf594e6898d74df746ae2ee91560fd73f856799e9 (patch)
treeca9c7012a5bfde1de72271fb66e96981ea466ff6 /BitKeeper
parentc838e8f8263bcd6870fe73ff1217f85f3f5c6380 (diff)
parent976f815cf309158ba134cb945d0ad0817d86891c (diff)
downloadxen-f594e6898d74df746ae2ee91560fd73f856799e9.tar.gz
xen-f594e6898d74df746ae2ee91560fd73f856799e9.tar.bz2
xen-f594e6898d74df746ae2ee91560fd73f856799e9.zip
bitkeeper revision 1.958 (40ca2c68fktLFIliN8Vr7Q8blSgj6w)
merge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/ignore23
-rw-r--r--BitKeeper/etc/logging_ok1
2 files changed, 13 insertions, 11 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 97a38b7ac4..cf002e46db 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -1,21 +1,24 @@
-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/xentrace/xentrace
-xen/xen
-xen/xen.*
xen/drivers/pci/classlist.h
xen/drivers/pci/devlist.h
xen/drivers/pci/gen-devlist
@@ -24,7 +27,5 @@ xen/include/hypervisor-ifs/arch
xen/include/xen/compile.h
xen/tools/elf-reloc
xen/tools/figlet/figlet
-TAGS
-install/*
-linux-*.tar.gz
-linux-*-xen/*
+xen/xen
+xen/xen.*
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 30f55a98cc..8674fa612d 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -23,6 +23,7 @@ kaf24@striker.cl.cam.ac.uk
laudney@eclipse.(none)
lynx@idefix.cl.cam.ac.uk
maw48@labyrinth.cl.cam.ac.uk
+mjw@wray-m-3.hpl.hp.com
mwilli2@equilibrium.research.intel-research.net
rac61@labyrinth.cl.cam.ac.uk
rgr22@boulderdash.cl.cam.ac.uk