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

Conflicts:
	libfreerdp/core/gcc.c

2014-10-25 10:29:06 -04:00

..

include

…

libwinpr

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

2014-10-25 10:29:06 -04:00

tools

…

.gitignore

…

CMakeLists.txt

…

WinPRConfig.cmake.in

…