projects / archipelago / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcb4e3a 88a8e86)
Merge branch 'tools' into xseg
authorVangelis Koukis <vkoukis@grnet.gr>
Sun, 19 Feb 2012 12:01:58 +0000 (14:01 +0200)
committerVangelis Koukis <vkoukis@grnet.gr>
Sun, 19 Feb 2012 12:01:58 +0000 (14:01 +0200)
Conflicts:
xseg/xq/xq.c

1  2 
xseg/peers/blockd.c patch | diff1 | diff2 | blob | history

diff --cc xseg/peers/blockd.c
Simple merge
Archipelago