Martin Haimberger 6ab0187d84 Merge remote-tracking branch 'upstream/master' into mh-channel ... Conflicts: channels/audin/client/oss/audin_oss.c channels/drive/client/drive_main.c channels/printer/client/printer_cups.c channels/printer/client/printer_main.c channels/rail/client/rail_main.c channels/rdpgfx/client/rdpgfx_main.c channels/rdpsnd/client/oss/rdpsnd_oss.c channels/remdesk/client/remdesk_main.c channels/remdesk/server/remdesk_main.c channels/tsmf/client/tsmf_media.c		2015-07-15 01:57:07 -07:00
..
include	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -07:00
libwinpr	Merge pull request #2766 from akallabeth/snprintf_to_sprintf_s	2015-07-15 09:47:43 +02:00
test	winpr: fixed HRESULT & SCODE types, added a ctest	2015-06-02 19:52:52 +02:00
tools	Merge pull request #2738 from bmiklautz/ffuncs	2015-07-01 13:02:32 +02:00
.gitignore	libwinpr-registry: start implementation	2012-06-05 18:56:31 -04:00
CMakeLists.txt	winpr: add intrin.h	2015-05-26 16:41:29 +02:00
WinPRConfig.cmake.in	cmake: export to different directory, export more build info	2013-10-29 15:16:44 -04:00