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
..
test	channels/remdesk: start sending authentication data	2014-06-30 12:51:27 -04:00
addin.c	Fixed coverity issue 1047619	2013-09-05 12:14:31 +02:00
assistance.c	xfreerdp: initial remote assistance controls (ctrl+alt+c to request/release control)	2014-06-30 17:17:06 -04:00
CMakeLists.txt	Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without	2014-07-11 11:53:58 +02:00
settings.c	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-05 09:55:54 -04:00