diff options
| author | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-14 14:27:45 +0000 |
|---|---|---|
| committer | akw27@boulderdash.cl.cam.ac.uk <akw27@boulderdash.cl.cam.ac.uk> | 2003-02-14 14:27:45 +0000 |
| commit | ed220108094cf8e5c3f70a7421182cdbcb59f3d3 (patch) | |
| tree | 22722275b0a231a057b08d99825b24d551545396 /BitKeeper | |
| parent | ce62d9e7f6d76422b025939279a2a51b5262a06d (diff) | |
| parent | 77cf55f0b8964f4d82d7119bfe59db8fddf4b320 (diff) | |
| download | xen-ed220108094cf8e5c3f70a7421182cdbcb59f3d3.tar.gz xen-ed220108094cf8e5c3f70a7421182cdbcb59f3d3.tar.bz2 xen-ed220108094cf8e5c3f70a7421182cdbcb59f3d3.zip | |
bitkeeper revision 1.34 (3e4cfce1Ot4YJzJ4jwNjDthlFrZV5w)
conflict resolution.
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 cca59e5d2c..f4f9934995 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 |