Marc-André Moreau 6bd4362e6d Merge branch 'auto-detect' of github.com:vworkspace/FreeRDP ... Conflicts: include/freerdp/settings.h libfreerdp/core/gcc.c libfreerdp/core/gcc.h libfreerdp/core/mcs.h libfreerdp/core/rdp.c		2014-01-25 17:08:43 -05:00
..
freerdp	Merge branch 'auto-detect' of github.com:vworkspace/FreeRDP	2014-01-25 17:08:43 -05:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00