Merge remote-tracking branch 'upstream/pr/136'
authorStephen Sinclair <radarsat1@gmail.com>
Tue, 16 Oct 2018 13:01:30 +0000 (15:01 +0200)
committerStephen Sinclair <radarsat1@gmail.com>
Tue, 16 Oct 2018 13:01:30 +0000 (15:01 +0200)
1  2 
CMakeLists.txt
RtAudio.cpp
RtAudio.h

diff --cc CMakeLists.txt
Simple merge
diff --cc RtAudio.cpp
Simple merge
diff --cc RtAudio.h
Simple merge