summaryrefslogtreecommitdiffstats
path: root/libssh/socket.c
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-08-23 16:41:29 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-08-23 16:41:29 +0200
commitd4bc6fa954f11b1da0c8881c2826ac4a60f8c41e (patch)
treec24b7b1ec877a102b86a3af47e01bf40e04cb4ac /libssh/socket.c
parent8bae43876fff891e33d48b177778ee4cb882c45a (diff)
parentfbfea94559aa776bca7983ef989d024c2d3b72fe (diff)
downloadlibssh-d4bc6fa954f11b1da0c8881c2826ac4a60f8c41e.tar.gz
libssh-d4bc6fa954f11b1da0c8881c2826ac4a60f8c41e.tar.xz
libssh-d4bc6fa954f11b1da0c8881c2826ac4a60f8c41e.zip
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Conflicts: include/libssh/priv.h
Diffstat (limited to 'libssh/socket.c')
0 files changed, 0 insertions, 0 deletions