Marc-André Moreau 29d14773c8 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: client/Windows/wf_client.c libfreerdp/common/assistance.c		2015-05-20 10:12:24 -04:00
..
winpr	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2015-05-20 10:12:24 -04:00
CMakeLists.txt	Added version and build info functions	2015-03-30 17:51:29 +02:00