]> xenbits.xensource.com Git - qemu-xen-4.0-testing.git/commitdiff
Merge ../qemu-2iwj
authorIan Jackson <iwj@mariner.uk.xensource.com>
Fri, 4 Jul 2008 15:48:24 +0000 (16:48 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 4 Jul 2008 15:48:24 +0000 (16:48 +0100)
1  2 
xen-hooks.mak

diff --cc xen-hooks.mak
Simple merge