]> xenbits.xensource.com Git - xen.git/commitdiff
projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1cf8ea 5a9b111)
bitkeeper revision 1.1159.1.252 (4177abd31PYu03Ds6umiBSns3W5ORw)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Thu, 21 Oct 2004 12:30:11 +0000 (12:30 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Thu, 21 Oct 2004 12:30:11 +0000 (12:30 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-doc

1  2 
docs/user.tex patch | diff1 | diff2 | blob | history

diff --cc docs/user.tex
Simple merge
Xen (staging and unstable) mirror