Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new lenses and camera models (backport #3140) #3154

Merged
merged 3 commits into from
Feb 18, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 7, 2025


This is an automatic backport of pull request #3140 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Feb 7, 2025
@mergify mergify bot assigned kmilos Feb 7, 2025
Copy link
Contributor Author

mergify bot commented Feb 7, 2025

Cherry-pick of 7173fad has failed:

On branch mergify/bp/main/pr-3140
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 7173fad5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/sonymn_int.cpp

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 6186619 has failed:

On branch mergify/bp/main/pr-3140
Your branch is ahead of 'origin/main' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 61866194.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/canonmn_int.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kmilos kmilos force-pushed the mergify/bp/main/pr-3140 branch from ff134b4 to 39d8937 Compare February 10, 2025 08:13
@kmilos kmilos added lens Issue related to lens detection makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Feb 10, 2025
(cherry picked from commit 7173fad)
(cherry picked from commit 6186619)
(cherry picked from commit d6f0f8f)
@kmilos kmilos force-pushed the mergify/bp/main/pr-3140 branch from 39d8937 to 1ecbca7 Compare February 10, 2025 20:20
@kmilos kmilos requested a review from neheb February 18, 2025 12:39
@kmilos kmilos merged commit c71a80b into main Feb 18, 2025
65 checks passed
@kmilos kmilos deleted the mergify/bp/main/pr-3140 branch February 18, 2025 15:33
@kmilos kmilos removed the request for review from neheb February 18, 2025 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lens Issue related to lens detection makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant