Merge branch 'audio' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Dec 2013 22:24:00 +0000 (17:24 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 11 Dec 2013 22:24:00 +0000 (17:24 -0500)
commit4356eb5572ceca5f497cfa45d51057ca28420645
tree1f55b445e92be820030b11b5873931de1d1a8a51
parentbf094ed99782e7a19a79952c49240a6bb3f3fcf4
parent7dc65be206dc0145be936182f36ccbc7c93dd6fd
Merge branch 'audio' of github.com:FreeRDP/FreeRDP

Conflicts:
libfreerdp/codec/audio.c
channels/rdpsnd/client/rdpsnd_main.c