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

Conflicts:
	libfreerdp/core/update.c

2014-11-11 09:55:48 -05:00

..

freerdp

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

2014-11-11 09:55:48 -05:00

CMakeLists.txt

install version.h

2013-11-06 17:44:17 +01:00