bitkeeper revision 1.1236.25.13 (423386505SwGplSmaVcNHcvNqtQ2QA)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sun, 13 Mar 2005 00:16:16 +0000 (00:16 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sun, 13 Mar 2005 00:16:16 +0000 (00:16 +0000)
Automerge

1  2 
.rootkeys
BitKeeper/etc/logging_ok
tools/libxc/Makefile

diff --cc .rootkeys
Simple merge
Simple merge
Simple merge