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 REALA ACE film simulation value to Fuji MakerNote values (backport #3099) #3100

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 28, 2024

Add value for new REALA ACE film simulation.


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

@mergify mergify bot added the conflicts label Dec 28, 2024
Copy link
Contributor Author

mergify bot commented Dec 28, 2024

Cherry-pick of 2816d03 has failed:

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

You are currently cherry-picking commit 2816d034.
  (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/fujimn_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

(cherry picked from commit 2816d03)

# Conflicts:
#	src/fujimn_int.cpp
@kmilos kmilos force-pushed the mergify/bp/0.28.x/pr-3099 branch from 55545f6 to ef1c322 Compare January 4, 2025 19:55
@kmilos kmilos added makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Jan 4, 2025
@kmilos kmilos added this to the v0.28.4 milestone Jan 4, 2025
@kmilos kmilos merged commit f39883c into 0.28.x Jan 4, 2025
62 checks passed
@mergify mergify bot deleted the mergify/bp/0.28.x/pr-3099 branch January 4, 2025 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
makerNote Anything related to one of the various supported MakerNote formats
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants