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

Sync dev with stable #1778

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Conversation

jagerman
Copy link
Member

In merging dev into stable, I was left with a few small differences for small changes/fixes that are present on stable but not dev.

Nothing major here:

  • Explicitly set OFF in CI jobs if werror is false.
  • Fix ci comment about stable build
  • Add missing bcrypt system linkage for windows static build
  • make sure oxenc headers are available via common
  • add missing boost header for version check to boost variant wrapper
  • drop unused patch (this used to be used in mingw static builds, but was applied upstream quite a while ago, and was dropped from stable but apparently only the application, but not the patch itself, got dropped from dev).

This includes miscellaneous small changes/fixes present on stable that
weren't present on dev.

Nothing major here.
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.

1 participant