summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPieter Noordhuis <pcnoordhuis@gmail.com>2013-05-01 09:23:17 -0700
committerPieter Noordhuis <pcnoordhuis@gmail.com>2013-05-01 09:23:17 -0700
commit91f47a1c198f78206ef02e791e0c5b5dfbeebe3a (patch)
tree0efcd2d651a075e0849cb45fdbcae4b613c297f5 /Makefile
parent63ce20dd15f83c6ff2bdab1bf3dcd1866e826c71 (diff)
parentbb3c4c17c45c89d980e2f4f59f59e55d13c77334 (diff)
Merge branch 'keepalive'
Also see pull request #161.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions