diff options
author | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-05 13:56:14 +0000 |
---|---|---|
committer | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-05 13:56:14 +0000 |
commit | 07b29e865c02423dea3508cabc7ba462fcb5db43 (patch) | |
tree | c6915b839b641598d34ef6a3b7afe2dc220e3f9c /BitKeeper | |
parent | f38d179aea9a8383b02719a2fbc14b089a9be6a1 (diff) | |
parent | e5e9ce51999838451bf4854a533a1bca25455133 (diff) | |
download | xen-07b29e865c02423dea3508cabc7ba462fcb5db43.tar.gz xen-07b29e865c02423dea3508cabc7ba462fcb5db43.tar.bz2 xen-07b29e865c02423dea3508cabc7ba462fcb5db43.zip |
bitkeeper revision 1.22.1.8 (3e4117feir_tT1ncjYWsGFnRPS64sg)
fix conflicts between VM and net updates.
Diffstat (limited to 'BitKeeper')
-rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2fd8b201d7..f47f840c0d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,5 +1,6 @@ akw27@boulderdash.cl.cam.ac.uk akw27@labyrinth.cl.cam.ac.uk +akw27@plucky.localdomain bd240@boulderdash.cl.cam.ac.uk iap10@labyrinth.cl.cam.ac.uk kaf24@labyrinth.cl.cam.ac.uk |