Marc-André Moreau 83ad1730b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: libfreerdp/core/input.c libfreerdp/core/update.c		2013-11-23 16:39:29 -05:00
..
include	Removed compilation warning	2013-11-18 11:34:24 -05:00
libwinpr	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2013-11-23 16:39:29 -05:00
tools	cmake: fix exporting of targets on pre-2.8.11	2013-10-29 14:47:40 -04:00
.gitignore	libwinpr-registry: start implementation	2012-06-05 18:56:31 -04:00
CMakeLists.txt	cmake: export to different directory, export more build info	2013-10-29 15:16:44 -04:00
WinPRConfig.cmake.in	cmake: export to different directory, export more build info	2013-10-29 15:16:44 -04:00