Luke Pulverenti 66e901ef93 fix merge conflicts

2017-04-07 15:26:19 -04:00

..

DisposableManagedObjectBase.cs

make dlna project portable

2016-11-04 04:31:05 -04:00

NetAcceptSocket.cs

rework filestream

2017-03-13 00:08:23 -04:00

SocketAcceptor.cs

update socket interfaces

2017-03-02 15:50:09 -05:00

SocketFactory.cs

fix merge conflicts

2017-04-07 15:26:19 -04:00

UdpSocket.cs

revert buffer size

2017-03-28 13:32:24 -04:00