Benoît LeBlanc 7215f4295f Merge branch 'master' of git://github.com/awakecoding/FreeRDP ...

Conflicts:
	include/freerdp/client.h

2013-11-07 10:42:35 -05:00

..

freerdp

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

2013-11-07 10:42:35 -05:00

CMakeLists.txt

…