diff options
| author | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2002-12-06 14:20:10 +0000 |
|---|---|---|
| committer | akw27@labyrinth.cl.cam.ac.uk <akw27@labyrinth.cl.cam.ac.uk> | 2002-12-06 14:20:10 +0000 |
| commit | 5a4d8dc794608778815046c0846c0cc23e1c66f3 (patch) | |
| tree | 3af4bc25b353cddae38042556ca46f548d130f63 /BitKeeper | |
| parent | 898bb9837e46faf85ee4ff4f6cd0c18379849824 (diff) | |
| parent | ea17a57b54fdd7908919e2322631d400c9bf030d (diff) | |
| download | xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.tar.gz xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.tar.bz2 xen-5a4d8dc794608778815046c0846c0cc23e1c66f3.zip | |
bitkeeper revision 1.7.1.7 (3df0b21aFrBUXjYnKdTMgt_D5mJJbg)
conflict resolutions
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 24128f27c5..f55bd8cab9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,4 +1,5 @@ akw27@boulderdash.cl.cam.ac.uk +akw27@labyrinth.cl.cam.ac.uk kaf24@labyrinth.cl.cam.ac.uk kaf24@plym.cl.cam.ac.uk kaf24@striker.cl.cam.ac.uk |