#925 Open
Repository
daniel_fort
Branch
unified_1100D.105_fixes
Repository
hudson
Branch
unified

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 7a3b5fa3f4c6
hg pull -r unified_1100D.105_fixes https://bitbucket.org/daniel_fort/magic-lantern
# Note: This will create a new head!
hg merge unified_1100D.105_fixes
hg commit -m 'Merged in daniel_fort/magic-lantern/unified_1100D.105_fixes (pull request #925)'
Author
  1. Daniel Fort
Reviewers
Description

Several modules are not compiling on the 1100D. These changes were cherry picked from experimental branches.

Comments (4)

      1. Daniel Fort author

        Whoa, that’s a big changeset. All of my changes are also in the other pull request you are considering. I’m only dealing with the current 1100D build issues.

        1. Alex

          Will think about it; sorry, currently working on something else and having a hard time to “change context”.