reserve merge conflicts from latest sf.net pull
authorHannes Gredler <hannes@gredler.at>
Wed, 5 Mar 2008 09:54:46 +0000 (10:54 +0100)
committerHannes Gredler <hannes@gredler.at>
Wed, 5 Mar 2008 09:54:46 +0000 (10:54 +0100)
commit103a6e3d17b89a355a8600d910bbd79f1af314b0
tree313edde58e98a2f3c8baff3b2dbc38b972ef8d40
parentc892d0d2ba5e46c7b53584603c14415fe17bea84
reserve merge conflicts from latest sf.net pull
lib/txtinfo/src/olsrd_txtinfo.c