projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 916735e 4366f3e)
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Fri, 20 Mar 2015 17:01:26 +0000 (17:01 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Fri, 20 Mar 2015 17:01:26 +0000 (17:01 +0000)
1  2 
tools/libxc/include/xenctrl.h patch | diff1 | diff2 | blob | history
tools/libxl/libxl.c patch | diff1 | diff2 | blob | history

diff --cc tools/libxc/include/xenctrl.h
Simple merge
diff --cc tools/libxl/libxl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.