Merge pull request #4453 from akallabeth/sound_channel_refactor

author David Fort <rdp.effort@gmail.com>

Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)

committer GitHub <noreply@github.com>

Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)
author David Fort <rdp.effort@gmail.com>
Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)
committer GitHub <noreply@github.com>
Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/ConfigOptions.cmake
Simple merge
diff --cc libfreerdp/CMakeLists.txt
Simple merge
author	David Fort <rdp.effort@gmail.com>
	Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)
committer	GitHub <noreply@github.com>
	Thu, 3 May 2018 09:56:58 +0000 (11:56 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/ConfigOptions.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history