projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 836ccc2 3db1b51)
Merge remote-tracking branch 'upstream/master' into android_async
authorArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 07:48:01 +0000 (09:48 +0200)
committerArmin Novak <anovak@thinstuff.com>
Fri, 4 Oct 2013 07:48:01 +0000 (09:48 +0200)

Trivial merge
Domain: Graphics System / Display Server;