Skip to content

Add new camera and lens model IDs (backport #9339) - #9398

Open
mergify[bot] wants to merge 3 commits into
0.28.xfrom
mergify/bp/0.28.x/pr-9339
Open

Add new camera and lens model IDs (backport #9339)#9398
mergify[bot] wants to merge 3 commits into
0.28.xfrom
mergify/bp/0.28.x/pr-9339

Conversation

@mergify

@mergify mergify Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

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

kmilos and others added 3 commits July 27, 2026 15:10
(cherry picked from commit 8c7eaff)

# Conflicts:
#	src/nikonmn_int.cpp
(cherry picked from commit 4dd7fdb)
(cherry picked from commit 662ff4b)
@mergify mergify Bot added the conflicts label Jul 27, 2026
@mergify

mergify Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 8c7eaff has failed:

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

You are currently cherry-picking commit 8c7eaff2.
  (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/nikonmn_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 added this to the v0.28.9 milestone Jul 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant