Merge branch 'master' of https://github.com/winddriver/Delphi-Cross-S… · VSBrilyakov/Delphi-Cross-Socket@6fca216 · GitHub

Commit

Merge branch 'master' of https://github.com/winddriver/Delphi-Cross-S…

Browse files

…ocket

# Conflicts:
#	Net/Net.CrossSocket.Epoll.pas
#	Net/Net.CrossSocket.Iocp.pas
#	Net/Net.CrossSocket.Kqueue.pas

Loading branch information

winddriver committed Feb 9, 2018

2 parents 7afc039 + a0461ae commit 6fca216