projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf094ed 7dc65be)
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)
Conflicts:
libfreerdp/codec/audio.c

1  2 
channels/rdpsnd/client/rdpsnd_main.c patch | diff1 | diff2 | blob | history

diff --cc channels/rdpsnd/client/rdpsnd_main.c
Simple merge
Domain: Graphics System / Display Server;