-
- Downloads
Merge branch 'master' into multichannel
Conflicts: daemon/src/audio/sound/audiofile.cpp daemon/src/sfl_types.h
Showing
- daemon/src/audio/audiorecord.cpp 11 additions, 11 deletionsdaemon/src/audio/audiorecord.cpp
- daemon/src/audio/audiorecord.h 1 addition, 1 deletiondaemon/src/audio/audiorecord.h
- daemon/src/audio/sound/audiofile.cpp 8 additions, 8 deletionsdaemon/src/audio/sound/audiofile.cpp
- daemon/src/sfl_types.h 0 additions, 12 deletionsdaemon/src/sfl_types.h
Please register or sign in to comment