Marc-André Moreau 85b1d6c167 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: libfreerdp/codec/h264.c		2014-08-05 09:55:54 -04:00
..
include	OpenSSL thread safety	2014-07-28 21:55:57 +02:00
libwinpr	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-08-05 09:55:54 -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