Skip to content

6.0.0 ndi6#1055

Merged
paulpv merged 5 commits into
6.0.0_actualfrom
6.0.0_ndi6
Aug 3, 2024
Merged

6.0.0 ndi6#1055
paulpv merged 5 commits into
6.0.0_actualfrom
6.0.0_ndi6

Conversation

@paulpv

@paulpv paulpv commented Jul 30, 2024

Copy link
Copy Markdown
Member

No description provided.

@paulpv
paulpv changed the base branch from master to 6.0.0_actual July 30, 2024 10:56
@paulpv
paulpv force-pushed the 6.0.0_ndi6 branch 4 times, most recently from afa9c9b to daf2b5f Compare July 30, 2024 11:20
@paulpv
paulpv marked this pull request as ready for review July 31, 2024 08:04
@paulpv paulpv self-assigned this Jul 31, 2024
paulpv added 2 commits July 31, 2024 01:15
Required by NDI license:
Per https://github.com/DistroAV/DistroAV/blob/master/lib/ndi/NDI%20SDK%20Documentation.pdf
"3 Licensing"
"Your application’s About Box and any other locations where trademark attribution is provided
should also specifically indicate that “NDI® is a registered trademark of Vizrt NDI AB”."
@paulpv

paulpv commented Jul 31, 2024

Copy link
Copy Markdown
Member Author

@Trouffman for your review, if you are able

@paulpv paulpv mentioned this pull request Aug 2, 2024
@paulpv

paulpv commented Aug 2, 2024

Copy link
Copy Markdown
Member Author

@Trouffman It has been over 48 hours since this code's last push.

Any concerns, or may I merge?

@paulpv
paulpv merged commit c1e8cf4 into 6.0.0_actual Aug 3, 2024
@paulpv
paulpv deleted the 6.0.0_ndi6 branch August 3, 2024 01:01
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