Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
authorpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 23:21:00 +0000 (01:21 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 20 Jul 2014 23:21:00 +0000 (01:21 +0200)
1  2 
src/IOHandler/IOSockets.c
src/IOHandler/IOSockets.h

Simple merge
Simple merge