Automated merge with http://olsrd.sf.net/hg/olsrd
authorHannes Gredler <hannes@gredler.at>
Fri, 29 Feb 2008 14:31:57 +0000 (15:31 +0100)
committerHannes Gredler <hannes@gredler.at>
Fri, 29 Feb 2008 14:31:57 +0000 (15:31 +0100)
commit0fc02ae8032fc7f8b086124764709fea31bf9eee
treef67e4ca4a5fe9061363cd0aecfaca9d4edff0514
parentce06b886680e86c419d192077f678f9c5f36337d
parent57c19b116a3566786aec5c41e623a4acc0c8a239
Automated merge with http://olsrd.sf.net/hg/olsrd
12 files changed:
lib/bmf/src/NetworkInterfaces.c
lib/httpinfo/src/olsrd_httpinfo.c
lib/nameservice/src/mapwrite.c
lib/nameservice/src/nameservice.c
lib/tas/src/plugin.c
lib/txtinfo/src/olsrd_txtinfo.c
src/hysteresis.c
src/link_set.c
src/lq_route.c
src/routing_table.c
src/tc_set.c
src/two_hop_neighbor_table.c