Marc-André Moreau 4356eb5572 Merge branch 'audio' of github.com:FreeRDP/FreeRDP ... Conflicts: libfreerdp/codec/audio.c		2013-12-11 17:24:00 -05:00
..
client	Merge branch 'audio' of github.com:FreeRDP/FreeRDP	2013-12-11 17:24:00 -05:00
server	cmake: fix exporting of targets on pre-2.8.11	2013-10-29 14:47:40 -04:00
ChannelOptions.cmake	channels: cmake cleanup, USB redirection refactoring	2012-11-20 19:34:52 -05:00
CMakeLists.txt	channels: refactoring of channels cmake scripts with macros	2012-10-17 02:14:19 -04:00