Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:52 +0000 (09:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:01:52 +0000 (09:01 -0400)
commitff816feb720ffd3f2eae157b8b06be69e763debf
tree7ee35235051881782a3c97bbed5afea5a864ac5a
parent6876be653a7c6516c7b4f3c16d10fe85e7794f35
parentb86c3b038bd390492de3fe981cc5f5aa0c06a788
Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx