Skip to content

Dev/3.3.0#117

Merged
plutoless merged 37 commits into
masterfrom
dev/3.3.0
Jan 30, 2021
Merged

Dev/3.3.0#117
plutoless merged 37 commits into
masterfrom
dev/3.3.0

Conversation

@yoreland
Copy link
Copy Markdown
Contributor

No description provided.

Xia Ning added 4 commits January 28, 2021 12:01
# Conflicts:
#	windows/APIExample/APIExample/Advanced/CustomVideoCapture/CAgoraCaptureVideoDlg.cpp
#	windows/APIExample/APIExample/Advanced/MediaIOCustomVideoCaptrue/CAgoraMediaIOVideoCaptureDlg.cpp
#	windows/APIExample/APIExample/Advanced/ScreenShare/AgoraScreenCapture.cpp
@plutoless plutoless merged commit 34a0897 into master Jan 30, 2021
@plutoless plutoless deleted the dev/3.3.0 branch January 30, 2021 13:51
alienzh pushed a commit that referenced this pull request Feb 12, 2026
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.

5 participants