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 more cameras and lenses (backport #3104) #3105

Merged
merged 4 commits into from
Jan 5, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2025


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

(cherry picked from commit a3329b9)
Copy link
Contributor Author

mergify bot commented Jan 5, 2025

Cherry-pick of 52aadbf has failed:

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

You are currently cherry-picking commit 52aadbfc.
  (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")

Cherry-pick of 5632b1d has failed:

On branch mergify/bp/0.28.x/pr-3104
Your branch is ahead of 'origin/0.28.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5632b1d6.
  (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")

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 5, 2025
kmilos added 3 commits January 5, 2025 19:16
(cherry picked from commit 52aadbf)

# Conflicts:
#	src/canonmn_int.cpp
(cherry picked from commit 5632b1d)

# Conflicts:
#	src/sonymn_int.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3104 branch from 145940f to f0d7051 Compare January 5, 2025 18:19
@kmilos kmilos added lens Issue related to lens detection makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Jan 5, 2025
@kmilos kmilos added this to the v0.28.4 milestone Jan 5, 2025
@kmilos kmilos merged commit af028a1 into 0.28.x Jan 5, 2025
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3104 branch January 5, 2025 18:35
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