Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:11:50 +0000 (09:11 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 1 Jul 2014 13:11:50 +0000 (09:11 -0400)
commit78e00db45d133c15c36829277960e530987c61dc
treee86254833216c08bdf15eae29bfb7d6a3b28288d
parentde7d452d379cc14a97256a7755918fa37b8b10ee
parent49cd7806d9d15f2c2155da733cc5d707f89acec8
Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx

Conflicts:
libfreerdp/codec/test/TestFreeRDPCodecClear.c