Revision f680f62b
| ID | f680f62b18b48549a388f8b4a5d907ce0572d78d |
| Parent | cae80b1f, 44ece4fe |
| Child | ad6e8e86 |
Merge branch 'baldesi'
Conflicts:
include/peer.h
src/Cache/topo_proto.c
src/Cache/topocache.c
src/Cache/topocache.h
src/ChunkTrading/chunk_delivery.c
src/Chunkiser/Makefile
src/Chunkiser/input-stream-avf.c
src/Chunkiser/libav-compat.h
src/Chunkiser/output-stream-avf.c
src/Makefile
src/PeerSampler/ncast.c
src/Tests/chunkiser_test.c
src/net_helper-ml.c
src/net_helper-udp.c
Files
- added
- modified
- copied
- renamed
- deleted