Skip to content

Fix LICENSE references for headless wheels #350

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

Merged
merged 4 commits into from
Jun 30, 2020
Merged

Fix LICENSE references for headless wheels #350

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3da5b1b
Fix typo in license
johnthagen Jun 25, 2020
61591fe
Fix FFmpeg packaging reference
johnthagen Jun 26, 2020
db574be
Correct headless license reference
johnthagen Jun 26, 2020
1bba3e6
Fix headless Qt license reference in README
johnthagen Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct headless license reference
  • Loading branch information
@johnthagen
johnthagen authored Jun 26, 2020
commit db574be4e2912384cd910dc3ed600704539e4c98
4 changes: 2 additions & 2 deletions LICENSE-3RD-PARTY.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

------------------------------------------------------------------------------
FFmpeg is redistributed within all opencv-python packages.
Qt 4.8.7 is redistributed within opencv-python Linux packages.
Qt 4.8.7 is redistributed within non-headless opencv-python Linux packages.
This license applies to FFmpeg and Qt binaries in the directory cv2/.

GNU LESSER GENERAL PUBLIC LICENSE
Expand Down Expand Up @@ -588,7 +588,7 @@ necessary. Here is a sample; alter the names:
That's all there is to it!

------------------------------------------------------------------------------
Qt 5 is redistributed within opencv-python macOS packages.
Qt 5 is redistributed within non-headless opencv-python macOS packages.
This license applies to Qt binaries in the directory cv2/.

GNU LESSER GENERAL PUBLIC LICENSE
Expand Down