Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Jun 2014 19:19:52 +0000 (15:19 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 18 Jun 2014 19:19:52 +0000 (15:19 -0400)
commit7818c77e5e060489f12eb3385dd8b6ca56b9d076
treecfac1250257245e1338f9bf9985d0c6146bc236c
parent425763d30a96cc3a2f518cc40aaa76f8b6951092
parente272bc923eefae3ae406779310253963e3fa8ae4
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx