mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e4a4aa4d3a
FreeRDP/channels
History
Marc-André Moreau e4a4aa4d3a Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 
Conflicts:
	channels/encomsp/client/encomsp_main.c
	libfreerdp/core/tcp.c
	libfreerdp/crypto/certificate.c
	server/Windows/CMakeLists.txt
	server/X11/xf_cursor.c
	server/X11/xf_input.c
	server/X11/xf_interface.c
	server/X11/xf_monitors.c
	server/X11/xf_peer.c
2014-08-11 19:22:33 -04:00
..
audin Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
client winpr: always build "monolitic" 2014-07-10 11:10:58 +02:00
cliprdr Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
disp Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-08-11 10:36:07 -04:00
drdynvc Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
drive winpr: always build "monolitic" 2014-07-10 11:10:58 +02:00
echo Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-08-11 10:36:07 -04:00
encomsp Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-08-11 19:22:33 -04:00
parallel winpr: always build "monolitic" 2014-07-10 11:10:58 +02:00
printer Fixed missing includes and invalid replacement. 2014-08-11 09:38:08 +02:00
rail Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
rdpdr Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
rdpei Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
rdpgfx libfreerdp-codec: cleanup and fix __lzcnt on Windows 2014-08-11 18:48:42 -04:00
rdpsnd Fixed missing includes and invalid replacement. 2014-08-11 09:38:08 +02:00
remdesk Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-08-11 19:22:33 -04:00
serial winpr: always build "monolitic" 2014-07-10 11:10:58 +02:00
server echo: add server echo channel api. 2014-07-15 11:42:12 +08:00
smartcard Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
tsmf Merge pull request #2027 from akallabeth/winpr-log 2014-08-11 10:38:28 -04:00
urbdrc Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
CMakeLists.txt channels: cmake cleanup, USB redirection refactoring 2012-11-20 19:34:52 -05:00