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

Conflicts:
	client/common/client.c

2014-07-28 16:58:32 -04:00

..

test

…

client.c

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

2014-07-28 16:58:32 -04:00

CMakeLists.txt

…

cmdline.c

Move multimon/span logic from cmdline.c to client.c post processing

2014-07-28 15:24:48 -04:00

compatibility.c

…

compatibility.h

…

file.c

…

module.def

…