Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 28 Jul 2015 13:21:33 +0000 (09:21 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 28 Jul 2015 13:21:33 +0000 (09:21 -0400)
commit5cb06ecc688a0379c59e9d26a4ffcff008961f2a
treea1b64f6851e4f449c64306127ebd7ce00385a51c
parentaae86d61ce2dda5462c88b49b048361881aeb0e0
parentdfa29804adc5695b925ab90084c048722ba8a861
Merge branch 'master' of github.com:FreeRDP/FreeRDP
client/X11/xf_gfx.c