Merge branch 'debug_threads'
Conflicts: configure.ac src/Makefile.am src/audio/alsalayer.cpp src/audio/audiortp.cpp
src/audio/audiorecord.cpp
0 → 100644
src/audio/audiorecord.h
0 → 100644
Conflicts: configure.ac src/Makefile.am src/audio/alsalayer.cpp src/audio/audiortp.cpp