projects
/
platform
/
upstream
/
freerdp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
35faa8b
be02849
)
Merge pull request #3015 from bmiklautz/pull/2936
author
akallabeth
<akallabeth@users.noreply.github.com>
Tue, 23 Feb 2016 15:46:16 +0000
(16:46 +0100)
committer
akallabeth
<akallabeth@users.noreply.github.com>
Tue, 23 Feb 2016 15:46:16 +0000
(16:46 +0100)
tcp: change TCP_USER_TIMEOUT to 16000
Trivial merge