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

fix_966_macosx_libintl_mono_framework (bp #967) #971

Merged
merged 2 commits into from
Jul 28, 2019

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2019

This is an automated backport of pull request #967 done by Mergify.io

Cherry-pick of 73c592c has failed:

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

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

Changes to be committed:

	modified:   CMakeLists.txt
	modified:   cmake/findDependencies.cmake

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   README.md

Cherry-pick of 1e2d08a has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   appveyor.yml

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

(cherry picked from commit 3ad2c8a)
…entation Update. Restored find_package(Intl REQUIRED)

(cherry picked from commit 73c592c)
@codecov
Copy link

codecov bot commented Jul 28, 2019

Codecov Report

Merging #971 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #971      +/-   ##
==========================================
- Coverage   71.18%   71.17%   -0.02%     
==========================================
  Files         148      148              
  Lines       19370    19360      -10     
==========================================
- Hits        13789    13779      -10     
  Misses       5581     5581
Impacted Files Coverage Δ
src/types.cpp 95.7% <0%> (-0.09%) ⬇️
src/version.cpp 91.42% <0%> (-0.09%) ⬇️
src/params.cpp 73.58% <0%> (-0.04%) ⬇️
src/exiv2.cpp 100% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6562aee...076585d. Read the comment docs.

@piponazo piponazo self-requested a review July 28, 2019 07:57
@piponazo piponazo merged commit dd3fcfa into master Jul 28, 2019
@mergify mergify bot deleted the mergify/bp/master/pr-967 branch July 28, 2019 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants