Jonathan Thomas 9eda757885 Merge branch 'develop' into audio-devices ...

# Conflicts:
#	src/AudioBufferSource.cpp
#	src/AudioReaderSource.cpp
#	src/AudioReaderSource.h
#	src/Clip.cpp
#	src/Frame.cpp
#	src/Qt/AudioPlaybackThread.h
#	src/audio_effects/Compressor.h
#	src/audio_effects/Delay.h
#	src/audio_effects/Echo.h
#	src/audio_effects/Expander.h

2021-12-02 22:05:19 -06:00

..

CMakeLists.txt

Adopt license management via Reuse project/tool (#711)

2021-10-16 01:26:26 -04:00

openshot.i

Merge branch 'develop' into audio-devices

2021-12-02 22:05:19 -06:00