Merge branch 'patch-2' of https://github.com/AMV007/FreeRDP into AMV007-patch-2
authorArmin Novak <armin.novak@thincast.com>
Tue, 17 Jan 2017 09:03:05 +0000 (10:03 +0100)
committerArmin Novak <armin.novak@thincast.com>
Tue, 17 Jan 2017 09:03:05 +0000 (10:03 +0100)
commit0f3dcc27652d9131856cc4de1e3bab9962cce730
treef4bc8b7842be41d66a1557ab635c05242a16a3c0
parent1046c95751d563876dbdcee14d008b3ec5b3c39c
parentc9d6611170e5105fc576d6a5d480f9a54d7b1fd2
Merge branch 'patch-2' of https://github.com/AMV007/FreeRDP into AMV007-patch-2

Conflicts:
channels/tsmf/client/tsmf_ifman.c
channels/tsmf/client/tsmf_media.c
channels/tsmf/client/tsmf_ifman.c
channels/tsmf/client/tsmf_media.c