On 20 February 2014 12:28, 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 f966f9ddd175bdf82f12650c3b7b5a93cc421d88: > > build: softmmu targets do not have a "main.o" file (2014-02-20 13:14:18 > +0100) > > No changes except context, but close enough to modified lines that git flags > a conflict.
Applied, thanks. -- PMM
