projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abca239 15f6b23)
bitkeeper revision 1.1236.23.1 (42305c30ANG71NeXhipzTkvkmsry9Q)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 10 Mar 2005 14:39:44 +0000 (14:39 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Thu, 10 Mar 2005 14:39:44 +0000 (14:39 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

1  2 
tools/libxc/xc_linux_restore.c patch | diff1 | diff2 | blob | history
tools/xfrd/xfrd.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/xc_linux_restore.c
Simple merge
diff --cc tools/xfrd/xfrd.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.