projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de7d452 49cd780)
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)
Conflicts:
libfreerdp/codec/test/TestFreeRDPCodecClear.c


Trivial merge
Domain: Graphics System / Display Server;