On Tue, 7 Jan 2020 at 19:08, Thomas Huth <th...@redhat.com> wrote: > > Hi! > > The following changes since commit f4d8cf148e43d942ef1202071e0cd66ce40322e0: > > Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-01-06' > into staging (2020-01-06 17:44:22 +0000) > > are available in the Git repository at: > > https://gitlab.com/huth/qemu.git tags/pull-request-2020-01-07 > > for you to fetch changes up to 2cf30f8ecb8b64cc5ccaf77244570e7def8075a5: > > docs: build an index page for the HTML docs (2020-01-07 19:48:30 +0100) > > ---------------------------------------------------------------- > * Move qtests into a separate directory > * Build index.html for docs > ----------------------------------------------------------------
Conflict in tests/Makefile.include, too big for me to easily see the right resolution. Can you fix up and resend, please? thanks -- PMM
