Merge branch 'master' of https://github.com/thestk/rtaudio

author Marcus Tomlinson <themarcustomlinson@gmail.com>

Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)

committer Marcus Tomlinson <themarcustomlinson@gmail.com>

Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)
author Marcus Tomlinson <themarcustomlinson@gmail.com>
Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)
committer Marcus Tomlinson <themarcustomlinson@gmail.com>
Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge
author	Marcus Tomlinson <themarcustomlinson@gmail.com>
	Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)
committer	Marcus Tomlinson <themarcustomlinson@gmail.com>
	Fri, 12 Oct 2018 21:27:33 +0000 (22:27 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history