Dolda2000 GitWeb / doldaconnect.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 363c705 2e12345)
Merge branch 'socket' into transsock
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 20:30:19 +0000 (21:30 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 20:30:19 +0000 (21:30 +0100)
Conflicts:

daemon/transfer.c
daemon/transfer.h

1  2 
daemon/transfer.c patch | diff1 | diff2 | blob | history

diff --cc daemon/transfer.c
Simple merge
Dolda Connect