]> xenbits.xensource.com Git - qemu-xen-4.2-testing.git/commit
Merge branch 'master' of ../qemu-iwj
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
commitc6483bc55748243c499c5575ee1b98ce5a9d1a65
treeab15bb32c375bc44969859d903bf4f14411a29e1
parent56c7e6f4494db935cd3cd190db4705c816abc8ee
parentb4d410a1c28fcd1ea528d94eb8b94b79286c25ed
Merge branch 'master' of ../qemu-iwj

Conflicts:

xen-hooks.mak
xen-hooks.mak
xenstore.c