Commit Graph

4 Commits

Author SHA1 Message Date
Marc-André Moreau
422336b8b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	include/freerdp/channels/log.h
2014-08-11 18:56:07 -04:00
Marc-André Moreau
b713bc1a98 freerdp: fix possible clog memory corruption 2014-08-11 18:51:22 -04:00
Nicholas Twerdochlib
c41c6589e1 Minor tweak to CLOG_PRINT macro. Initialalize tag buffer to NULL. Use strncat as a fail safe. 2014-08-11 18:48:11 -04:00
Armin Novak
66b8905ac6 Using special log defines for channels now. 2014-08-11 09:12:01 +02:00