Skip to content

Add an OpenBSD check#18507

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
sizeofvoid:openbsd
Oct 5, 2020
Merged

Add an OpenBSD check#18507
opencv-pushbot merged 1 commit intoopencv:3.4from
sizeofvoid:openbsd

Conversation

@sizeofvoid
Copy link
Copy Markdown
Contributor

Simple patch to check if OpenBSD is defined.

@alalek
Copy link
Copy Markdown
Member

alalek commented Oct 5, 2020

Thank you for contribution!

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@sizeofvoid sizeofvoid changed the base branch from master to 3.4 October 5, 2020 06:13
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@opencv-pushbot opencv-pushbot merged commit aece3e7 into opencv:3.4 Oct 5, 2020
@sizeofvoid sizeofvoid deleted the openbsd branch October 5, 2020 19:02
@alalek alalek mentioned this pull request Oct 7, 2020
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.

3 participants