projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02e69c0 1cc0525)
bitkeeper revision 1.1236.1.65 (422c9421LVndOoo0PvX8eyQwAXrjxw)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 7 Mar 2005 17:49:21 +0000 (17:49 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Mon, 7 Mar 2005 17:49:21 +0000 (17:49 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk

1  2 
BitKeeper/etc/logging_ok patch | diff1 | diff2 | blob | history

diff --cc BitKeeper/etc/logging_ok
index d8584e8ba4a30fd9c584d88977adf164c905d8d8,b8ea3df1ebdfcfeed4d2b7888612be9ee7ae4849..e2ecbe1f5b3f06c0bd503b757227db9aad938f26
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -76,5 -76,5 +76,6 @@@ tlh20@elite.cl.cam.ac.u
  tlh20@labyrinth.cl.cam.ac.uk
  tw275@labyrinth.cl.cam.ac.uk
  tw275@striker.cl.cam.ac.uk
 +vh249@airwolf.cl.cam.ac.uk
+ xen-ia64.adm@bkbits.net
  xenbk@gandalf.hpl.hp.com
Unnamed repository; edit this file 'description' to name the repository.