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 some Canon RF lenses w/ ext (backport #3116) #3118

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2025

Edit: Second commit is purely cosmetic, more consistent w/ Canon's own Exif.Photo.LensModel / Exif.Canon.LensModel strings...


This is an automatic backport of pull request #3116 done by Mergify.

Copy link
Contributor Author

mergify bot commented Jan 13, 2025

Cherry-pick of 0643639 has failed:

On branch mergify/bp/0.28.x/pr-3116
Your branch is up to date with 'origin/0.28.x'.

You are currently cherry-picking commit 06436390.
  (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

@mergify mergify bot added the conflicts label Jan 13, 2025
@kmilos kmilos added the lens Issue related to lens detection label Jan 13, 2025
@kmilos kmilos added this to the v0.28.4 milestone Jan 13, 2025
kmilos and others added 2 commits January 13, 2025 21:11
(cherry picked from commit 0643639)

# Conflicts:
#	src/canonmn_int.cpp
(cherry picked from commit 27ad395)

# Conflicts:
#	src/canonmn_int.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3116 branch from a12342a to 49512a3 Compare January 14, 2025 18:11
@kmilos kmilos removed the conflicts label Jan 14, 2025
@kmilos kmilos merged commit 9405eba into 0.28.x Jan 14, 2025
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3116 branch January 14, 2025 18:39
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant