Merge remote-tracking branch 'upstream/pr/154'

author Stephen Sinclair <radarsat1@gmail.com>

Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)

committer Stephen Sinclair <radarsat1@gmail.com>

Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)
author Stephen Sinclair <radarsat1@gmail.com>
Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)
committer Stephen Sinclair <radarsat1@gmail.com>
Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)
diff --cc RtAudio.cpp
Simple merge
diff --cc RtAudio.h
Simple merge
author	Stephen Sinclair <radarsat1@gmail.com>
	Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)
committer	Stephen Sinclair <radarsat1@gmail.com>
	Tue, 16 Oct 2018 13:04:54 +0000 (15:04 +0200)
		1	2
RtAudio.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
RtAudio.h	patch \|	diff1 \|	diff2 \|	blob \| history