Merge branch 'adam-sandbox' of https://github.com/synergy/synergy into adam-sandbox

Browse Source

Conflicts:
	src/lib/plugin/ns/SecureSocket.cpp

...

This commit is contained in:

Adam Potolsky

2015-06-12 14:45:29 -07:00

parent 16a2815504 4b0dec69bf

commit ad37db13a9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available