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-550D.110 https://bitbucket.org/daniel_fort/magic-lantern# Note: This will create a new head!hg merge update-to-550D.110hg commit -m 'Merged in daniel_fort/magic-lantern/update-to-550D.110 (pull request #905)'
I'm doing all this in QEMU. Tried running some of the selftests but I got stuck when it asked to switch to movie mode. Most tests passed and the ones that failed might be QEMU issues. Best to run the tests in camera -- took a long time just to get a 550D user to verify that it works.