Marc-André Moreau 6f9a256c5c Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx ...

Conflicts:
	channels/drdynvc/client/dvcman.c
	client/X11/xf_client.c
	include/freerdp/dvc.h

2014-06-12 12:03:08 -04:00

..

client

Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

2014-06-12 12:03:08 -04:00

server

Revert "channels: fix link errors."

2014-04-22 15:05:53 +08:00

ChannelOptions.cmake

channels: rdpsnd refactoring, drdynvc initial server-side code

2013-08-18 21:52:55 -04:00

CMakeLists.txt

channels: rdpsnd refactoring, drdynvc initial server-side code

2013-08-18 21:52:55 -04:00