Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:35 +0000 (09:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:35 +0000 (09:01 -0400)
commit6876be653a7c6516c7b4f3c16d10fe85e7794f35
tree4dd62c46425f0ff1c2c0e9a798eaa02244598ad3
parentdd36617093e6deff4f7a71f3d522b26377b459e7
parent856880b1a56bbc4ca0425ea47da7cca7605d39e0
Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx