projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37b0d63 94a8360)
Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 May 2014 15:17:58 +0000 (11:17 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 21 May 2014 15:17:58 +0000 (11:17 -0400)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
client/common/cmdline.c patch | diff1 | diff2 | blob | history
winpr/libwinpr/synch/wait.c patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc client/common/cmdline.c
Simple merge
diff --cc winpr/libwinpr/synch/wait.c
Simple merge
Domain: Graphics System / Display Server;