projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caeacad d0f7b7a)
bitkeeper revision 1.936 (40c09331NirwCvM2egwMlUy301iNmg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 4 Jun 2004 15:20:17 +0000 (15:20 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 4 Jun 2004 15:20:17 +0000 (15:20 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno

1  2 
tools/xend/lib/main.py patch | diff1 | diff2 | blob | history

diff --cc tools/xend/lib/main.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.