Marc-André Moreau 168d46f253 Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP ... Conflicts: libfreerdp/core/nego.c libfreerdp/core/peer.c winpr/libwinpr/synch/wait.c		2014-08-15 11:43:50 -04:00
..
include	libfreerdp-codec: cleanup and fix __lzcnt on Windows	2014-08-11 18:48:42 -04:00
libwinpr	Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP	2014-08-15 11:43:50 -04:00
tools	winpr/makecert: improve command line options	2014-07-17 16:47:29 -04:00
.gitignore	libwinpr-registry: start implementation	2012-06-05 18:56:31 -04:00
CMakeLists.txt	winpr: always build "monolitic"	2014-07-10 11:10:58 +02:00
WinPRConfig.cmake.in	cmake: export to different directory, export more build info	2013-10-29 15:16:44 -04:00