review.tizen.org Git - platform/upstream/freerdp.git/commit

projects / platform / upstream / freerdp.git / commit

author	Martin Haimberger <martin.haimberger@thincast.com>
	Wed, 15 Jul 2015 08:57:07 +0000 (01:57 -0700)
committer	Martin Haimberger <martin.haimberger@thincast.com>
	Wed, 15 Jul 2015 08:57:07 +0000 (01:57 -0700)
commit	6ab0187d843afcf0b949c2ee3db698f1ddcf8f55
tree	615bb2a4681f280d8907d3a30c7f501377dd44ec	tree \| snapshot
parent	b8c110d19b75f17320ef9d08b411d5d10f1adf54	commit \| diff
parent	b06d83ba80dcd633daaff294eb6f370ee5a773ad	commit \| diff

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

30 files changed:

channels/audin/client/audin_main.c	diff1 \|	diff2 \|	blob \| history
channels/audin/client/opensles/audin_opensl_es.c	diff1 \|	diff2 \|	blob \| history
channels/audin/client/oss/audin_oss.c	diff1 \|	diff2 \|	blob \| history
channels/cliprdr/client/cliprdr_main.c	diff1 \|	diff2 \|	blob \| history
channels/drive/client/drive_main.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_cups.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_main.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_win.c	diff1 \|	diff2 \|	blob \| history
channels/rdpgfx/client/rdpgfx_main.c	diff1 \|	diff2 \|	blob \| history
channels/rdpgfx/client/rdpgfx_main.h	diff1 \|	diff2 \|	blob \| history
channels/rdpsnd/client/oss/rdpsnd_oss.c	diff1 \|	diff2 \|	blob \| history
channels/remdesk/client/remdesk_main.c	diff1 \|	diff2 \|	blob \| history
channels/remdesk/server/remdesk_main.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/alsa/tsmf_alsa.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/gstreamer/tsmf_X11.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/gstreamer/tsmf_gstreamer.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/tsmf_main.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/tsmf_media.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/data_transfer.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/libusb/libusb_udevman.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/urbdrc_main.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_client.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_cliprdr.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_gfx.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_rail.c	diff1 \|	diff2 \|	blob \| history
libfreerdp/core/client.c	diff1 \|	diff2 \|	blob \| history
libfreerdp/core/freerdp.c	diff1 \|	diff2 \|	blob \| history
server/shadow/shadow_audin.c	\|	diff2 \|	blob \| history
server/shadow/shadow_encomsp.c	diff1 \|	diff2 \|	blob \| history
server/shadow/shadow_remdesk.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / Display Server;

RSS Atom

channels/audin/client/audin_main.c	diff1 \|	diff2 \|	blob \| history
channels/audin/client/opensles/audin_opensl_es.c	diff1 \|	diff2 \|	blob \| history
channels/audin/client/oss/audin_oss.c	diff1 \|	diff2 \|	blob \| history
channels/cliprdr/client/cliprdr_main.c	diff1 \|	diff2 \|	blob \| history
channels/drive/client/drive_main.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_cups.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_main.c	diff1 \|	diff2 \|	blob \| history
channels/printer/client/printer_win.c	diff1 \|	diff2 \|	blob \| history
channels/rdpgfx/client/rdpgfx_main.c	diff1 \|	diff2 \|	blob \| history
channels/rdpgfx/client/rdpgfx_main.h	diff1 \|	diff2 \|	blob \| history
channels/rdpsnd/client/oss/rdpsnd_oss.c	diff1 \|	diff2 \|	blob \| history
channels/remdesk/client/remdesk_main.c	diff1 \|	diff2 \|	blob \| history
channels/remdesk/server/remdesk_main.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/alsa/tsmf_alsa.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/gstreamer/tsmf_X11.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/gstreamer/tsmf_gstreamer.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/tsmf_main.c	diff1 \|	diff2 \|	blob \| history
channels/tsmf/client/tsmf_media.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/data_transfer.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/libusb/libusb_udevman.c	diff1 \|	diff2 \|	blob \| history
channels/urbdrc/client/urbdrc_main.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_client.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_cliprdr.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_gfx.c	diff1 \|	diff2 \|	blob \| history
client/X11/xf_rail.c	diff1 \|	diff2 \|	blob \| history
libfreerdp/core/client.c	diff1 \|	diff2 \|	blob \| history
libfreerdp/core/freerdp.c	diff1 \|	diff2 \|	blob \| history
server/shadow/shadow_audin.c	\|	diff2 \|	blob \| history
server/shadow/shadow_encomsp.c	diff1 \|	diff2 \|	blob \| history
server/shadow/shadow_remdesk.c	diff1 \|	diff2 \|	blob \| history