git.proxmox.com Git - mirror_qemu.git/history - docs/devel/conflict-resolution.rst

]> git.proxmox.com Git - mirror_qemu.git/history - docs/devel/conflict-resolution.rst

2021-04-04	Peter Maydell	Merge remote-tracking branch 'remotes/xtensa/tags/20210...	blob \| commitdiff \| raw
2021-04-02	Peter Maydell	Merge remote-tracking branch 'remotes/mst/tags/for_upst...	blob \| commitdiff \| raw
2021-04-01	Peter Maydell	Merge remote-tracking branch 'remotes/thuth-gitlab...	blob \| commitdiff \| raw
2021-04-01	Peter Maydell	Merge remote-tracking branch 'remotes/marcandre/tags...	blob \| commitdiff \| raw
2021-04-01	Peter Maydell	Merge remote-tracking branch 'remotes/bonzini-gitlab...	blob \| commitdiff \| raw
2021-04-01	Paolo Bonzini	docs: Add a QEMU Code of Conduct and Conflict Resolutio...	blob \| commitdiff \| raw

QEMU mirror