Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding...
authorMike McDonald <Mike.McDonald@software.dell.com>
Tue, 20 Jan 2015 13:09:00 +0000 (08:09 -0500)
committerMike McDonald <Mike.McDonald@software.dell.com>
Tue, 20 Jan 2015 13:09:00 +0000 (08:09 -0500)
commitb184a7531fd8bdb4f5341b0a69684f35e96b4cca
treeb800c18d121db2bd8dd39ff59d01da1fd9ef9a10
parent7febeb2dec144cf2eedb22feb3fbbeb0cdebf18c
parent0054b6b134c99eaa2e76840fdc441cf5d8f852d7
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding-staging
include/freerdp/server/rdpdr.h