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

projects / platform / upstream / freerdp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6e1cdf1 951368a)

author	Marc-André Moreau <marcandre.moreau@gmail.com>
	Thu, 27 Feb 2014 20:09:06 +0000 (15:09 -0500)
committer	Marc-André Moreau <marcandre.moreau@gmail.com>
	Thu, 27 Feb 2014 20:09:06 +0000 (15:09 -0500)
commit	419e2936beec911811fed8fbb7ccfb00a9fc9c51
tree	dd8b84a5221f541b0682692e61f0be74026d0da8	tree \| snapshot
parent	6e1cdf1b67c643ec3faed4a2f258d1969f2f43ae	commit \| diff
parent	951368a1cea008b3c3fbb5c1b7760ae2021356a6	commit \| diff

Merge branch 'master' of github.com:awakecoding/FreeRDP into channels

channels/rdpdr/client/rdpdr_main.c	diff1 \|	diff2 \|	blob \| history
channels/rdpdr/client/rdpdr_main.h	diff1 \|	diff2 \|	blob \| history
channels/rdpsnd/server/rdpsnd_main.c	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / Display Server;