Merge branch 'ba_2016_heimes' of https://git.rwth-aachen.de/ita/ITADataSources into ba_2016_heimes
# Conflicts: # src/ITANetAudioMessage.cpp # tests/NetAudio/ITANetAudioTest.cpp
Please register or sign in to comment
# Conflicts: # src/ITANetAudioMessage.cpp # tests/NetAudio/ITANetAudioTest.cpp