Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 26 Jun 2015 18:00:03 +0000 (14:00 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 26 Jun 2015 18:00:03 +0000 (14:00 -0400)
commit5ec19d2045c0c144f2fd357928d2723fdd70fba8
tree3561961c70957ca5752c1cfbdb6522bdf06825c3
parent24ed6b06cc6b8da33c4e5d98198d3b5b76c12b41
parent20878e50fe4c3e843209142af670dcf5a4fd5125
Merge branch 'master' of github.com:FreeRDP/FreeRDP
channels/rdpgfx/client/rdpgfx_main.c