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 97b73e7a781e
# Note: This will create a new head!
hg merge 48b06f2f7729
hg commit -m 'Merged in qemu (pull request #818)'
Current state: http://www.magiclantern.fm/forum/index.php?topic=2864.100
(boots Canon GUI on select models, can browse Canon and ML menu on 500D with unmodified autoexec.bin, can browse ML menu with minimally modified autoexec.bin on select models, photo capture emulation on a few models)
Jenkins job: http://builds.magiclantern.fm/jenkins/job/QEMU-tests/
The development will continue on this branch after merging, but the current state is already useful for merging.
For ML core, this means:
Some TODOs (not necessarily before merging; any help is welcome):
just accept :)
Looks like this needs the same treatment as the backtrace branch in order to compile on OS X:
[ CP ] ../../src/backtrace.c
usage: cp [-R [-H | -L | -P]] [-fi | -n] [-apvX] source_file target_file
cp [-R [-H | -L | -P]] [-fi | -n] [-apvX] source_file ... target_directory
make: *** [../../src/backtrace.c] Error 64
Merge fixed it - Thanks!