Merge pull request #2057 from ptsekov/software-gdi-improvements

author Marc-André Moreau <marcandre.moreau@gmail.com>

Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)

committer Marc-André Moreau <marcandre.moreau@gmail.com>

Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)
author Marc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)
committer Marc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)
diff --cc client/X11/xf_client.c
Simple merge
diff --cc client/X11/xf_gdi.c
Simple merge
diff --cc client/X11/xf_graphics.c
Simple merge
diff --cc client/X11/xfreerdp.h
Simple merge
author	Marc-André Moreau <marcandre.moreau@gmail.com>
	Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)
committer	Marc-André Moreau <marcandre.moreau@gmail.com>
	Fri, 5 Sep 2014 19:05:53 +0000 (15:05 -0400)
		1	2
client/X11/xf_client.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/X11/xf_gdi.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/X11/xf_graphics.c	patch \|	diff1 \|	diff2 \|	blob \| history
client/X11/xfreerdp.h	patch \|	diff1 \|	diff2 \|	blob \| history