Marc-André Moreau 85b1d6c167 Merge branch 'master' of github.com:FreeRDP/FreeRDP ...

Conflicts:
	libfreerdp/codec/h264.c

2014-08-05 09:55:54 -04:00

..

client

channels: cleanup RDP8 virtual channels

2014-07-28 16:47:42 -04:00

server

fix compiler warnings

2014-07-29 05:22:29 +02:00

ChannelOptions.cmake

echo: add server echo channel api.

2014-07-15 11:42:12 +08:00

CMakeLists.txt

echo: add server echo channel api.

2014-07-15 11:42:12 +08:00