Manual Lens Info support to Crop_rec_4k

#940 Open
Repository
aprofiti
Branch
crop_rec_4k_mlv_snd_elns
Repository
hudson
Branch
crop_rec_4k_mlv_snd

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 crop_rec_4k_mlv_snd
hg pull -r crop_rec_4k_mlv_snd_elns https://bitbucket.org/aprofiti/magic-lantern
hg merge crop_rec_4k_mlv_snd_elns
hg commit -m 'Merged in aprofiti/magic-lantern/crop_rec_4k_mlv_snd_elns (pull request #940)'
Author
  1. alessandro profiti
Reviewers
Description

Merged manual_lens_info and then splitted into different commits

Comments (6)

  1. Daniel Fort

    The selftest module won’t compile. The problem started when manual_lens_info was merged into crop_rec_4k_mlv_snd.

        1. alessandro profiti author

          Thanks, replied in your PR comment section.

          I would prefer @a1ex to review commit065ceae(I was thinking to partially blackout here that commit if it’s holding back the merge), I made a comment above and looks like he forgot to reply.

          It’s strange that he broke this after his commit, so can’t understand if the main repo is missing somethings that he has in local or what else….

          1. Daniel Fort

            Got it. I was wrongly assuming that the selftest module to use was the one in the lua_fix branch. Ran hg bisect and it turned up that same commit.