Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Sep 2014 21:29:35 +0000 (17:29 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 5 Sep 2014 21:29:35 +0000 (17:29 -0400)
commit033e75467ba002b89b235dc87cca072c829659ef
treeaf6786f6acb6552b651a6ea4b07081d83b9a084a
parent510a02ea94f7d7d114e21f1ec57a70e3e35e7581
parent66bbbf0519b145b0df26771fd7570e9570bbb0b4
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
libfreerdp/gdi/gdi.c