projects / platform / upstream / freerdp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18eaddc 19c25cf)
Merge branch 'master' of git://github.com/awakecoding/FreeRDP
authorBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 18 Jul 2014 16:02:52 +0000 (12:02 -0400)
committerBenoit LeBlanc <benoit.leblanc@awakecoding.com>
Fri, 18 Jul 2014 16:02:52 +0000 (12:02 -0400)
1  2 
include/freerdp/settings.h patch | diff1 | diff2 | blob | history
libfreerdp/common/settings.c patch | diff1 | diff2 | blob | history

diff --cc include/freerdp/settings.h
Simple merge
diff --cc libfreerdp/common/settings.c
Simple merge
Domain: Graphics System / Display Server;