resolve merge conflicts
authorHannes Gredler <hannes@gredler.at>
Wed, 27 May 2009 11:11:12 +0000 (13:11 +0200)
committerHannes Gredler <hannes@gredler.at>
Wed, 27 May 2009 11:11:12 +0000 (13:11 +0200)
commit8af0664dcb8490c9fde951614fcc71fffbfe46a0
treef9f169b265f4da41c96d30da3578aa8473c3f5fe
parent6e23244a3efb857cd42b7346620d89898ce2b2f8
parent2fb2642d36d6f7b6e965929ced258753556fcbcf
resolve merge conflicts
src/neighbor_table.c
src/neighbor_table.h
src/process_package.c
src/two_hop_neighbor_table.h