mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a22dc21c15
FreeRDP/server
History
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
..
common Revert a bug introduced in PR #2134 2014-11-12 17:15:13 +01:00
Mac Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
Sample Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
shadow Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
Windows Merge remote-tracking branch 'upstream/master' into mh-channel 2015-07-15 01:57:07 -07:00
.gitignore
CMakeLists.txt build: cmake 3.1 compatibility 2014-12-12 19:26:22 +01:00