Skip to content

Merge 3.4 #2233

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 7 commits into from
Aug 16, 2019
Merged

Merge 3.4 #2233

merged 7 commits into from
Aug 16, 2019

Conversation

alalek
Copy link
Member

@alalek alalek commented Aug 16, 2019 •
edited
Loading

#2193 from SoylentGraham:aruco_noglobalinit
#2222 from adilfaqah:patch-1
#2225 from alalek:backport

Main PR: opencv/opencv#15323
Previous "Merge 3.4": #2223

force_builders=Custom
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Custom=ubuntu-cuda:16.04

@alalek
Copy link
Member Author

alalek commented Aug 16, 2019

👍

@alalek alalek merged commit fd00489 into opencv:master Aug 16, 2019
@alalek alalek mentioned this pull request Aug 30, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alalek alalek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alalek @mut-ex @SoylentGraham