Skip to content
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.

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

SYNERGY-1032 - Send secure input notifications to client #7043

Merged
merged 51 commits into from Jun 29, 2021

Conversation

igor-sikachyna
Copy link
Contributor

No description provided.

@igor-sikachyna igor-sikachyna changed the title Synergy-1032 - Send secure input notifications to client SYNERGY-1032 - Send secure input notifications to client Jun 22, 2021
@igor-sikachyna igor-sikachyna marked this pull request as ready for review June 29, 2021 08:40
Copy link
Contributor

@SerhiiGadzhilov SerhiiGadzhilov left a comment

Choose a reason for hiding this comment

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

Could you please, resolve conflicts.

igor-sikachyna and others added 3 commits June 29, 2021 13:34
…otifications-to-client

# Conflicts:
#	ChangeLog
#	src/lib/platform/MSWindowsScreen.cpp
#	src/lib/platform/MSWindowsScreen.h
#	src/lib/platform/OSXScreen.h
#	src/lib/platform/OSXScreen.mm
#	src/lib/platform/XWindowsScreen.cpp
#	src/lib/platform/XWindowsScreen.h
#	src/lib/synergy/IPlatformScreen.h
#	src/lib/synergy/Screen.cpp
#	src/lib/synergy/Screen.h
@sonarcloud
Copy link

sonarcloud bot commented Jun 29, 2021

@igor-sikachyna
Copy link
Contributor Author

@SerhiiGadzhilov, conflict is resolved. As a note, protocol changes are done in the way proposed by @abatyiev

@SerhiiGadzhilov SerhiiGadzhilov merged commit 2fdde93 into master Jun 29, 2021
@SerhiiGadzhilov SerhiiGadzhilov deleted the SYNERGY-1032-Send-notifications-to-client branch June 29, 2021 15:45
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.

None yet

2 participants