projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e87df0b 0c1fd59)
Merge branch 'channels' of github.com:FreeRDP/FreeRDP into channels
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Oct 2012 00:01:54 +0000 (20:01 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 17 Oct 2012 00:01:54 +0000 (20:01 -0400)

Trivial merge
Domain: Graphics System / Display Server;