Marc-André Moreau a48ed7239d Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: libfreerdp/core/update.c		2014-11-11 09:55:48 -05:00
..
cache	xfreerdp: fix glyph index primary drawing order	2014-10-29 20:56:26 +01:00
codec	codec: fix pointer data conversion + 24bpp support	2014-10-31 12:18:08 +01:00
common	Merge pull request #1965 from akallabeth/dynamic-addin-naming	2014-10-31 13:42:16 +01:00
core	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-11-11 09:55:48 -05:00
crypto	Merge pull request #2130 from eosrei/2056/ts-gateway-connect-fail	2014-10-25 11:52:29 -04:00
gdi	libfreerdp-gdi: fix bitmap update scanline size	2014-11-07 17:19:46 -05:00
locale	Fixed compiler warnings.	2014-09-15 08:55:00 +02:00
primitives	Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx	2014-09-17 19:09:56 -04:00
rail	Replaced logging in libfreerdp with wlog defines.	2014-09-15 08:48:46 +02:00
utils	channels/tsmf: remove dependency on deprecated eventing system	2014-11-10 16:33:34 -05:00
CMakeLists.txt	Merge pull request #1965 from akallabeth/dynamic-addin-naming	2014-10-31 13:42:16 +01:00