Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update 7a3b5fa3f4c6hg pull -r update-to-650D.105 https://bitbucket.org/daniel_fort/magic-lantern# Note: This will create a new head!hg merge update-to-650D.105hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-650D.105 (pull request #914)'
Backing out commit 4cf70155104c in the new-dryos-task-hooks branch resolves the issue.
Looks like that bug was solved by that commit.
Right--had it backwards on my post. So it seems that this commit should be applied the unified branch, right? It shouldn't be a part of the 650D firmware update PR.
This commit won't work without the rest of new-dryos-task-hooks, so the entire branch should be applied to unified. That branch depends on QEMU, so QEMU should be applied first. I should reinstall that Windows 10 VM to test it...
Incorporated PlayMovieGuideApp_handler stub fix discovered while running lua tests.