On 17 February 2014 17:35, Paolo Bonzini <pbonz...@redhat.com> wrote: > Anthony, Peter, > > The following changes since commit 89e4a51ca9546a7bbe1998c4e3d4a3ac3a0c19be: > > Merge remote-tracking branch 'stefanha/tags/tracing-pull-request' into > staging (2014-01-31 11:13:08 +0000) > > are available in the git repository at: > > git://github.com/bonzini/qemu.git configure > > for you to fetch changes up to 2001070d5d4b14a2350a14a772aaf26d08ce8d90: > > build: softmmu targets do not have a "main.o" file
This has merge conflicts in rules.mak -- Paolo has kindly agreed to do a respin for me. thanks -- PMM
