projects
/
nbd.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c11cc2
11efe4c
)
Merge branch 'master' into names
author
Wouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000
(18:54 -0400)
committer
Wouter Verhelst <w@uter.be>
Tue, 27 Jul 2010 22:54:37 +0000
(18:54 -0400)
1
2
nbd-client.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
nbd-client.c
Simple merge