search

sccn / lsl_archived

Multi-modal time-synched data transmission over local network
242 stars 134 forks source link

fix incomplete merge #304

Closed gisogrimm closed 6 years ago

gisogrimm commented 6 years ago

The file time_receiver.cpp containes an incomplete merge.