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

Conflicts:
	channels/disp/client/disp_main.c

2014-08-11 10:36:07 -04:00

..

client

Merge branch 'master' of github.com:FreeRDP/FreeRDP

2014-08-11 10:36:07 -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