Merge branch 'stable' into dual_socket
authorHenning Rogge <henning@henning-notebook.fritz.box>
Wed, 30 Dec 2009 01:32:02 +0000 (02:32 +0100)
committerHenning Rogge <henning@henning-notebook.fritz.box>
Wed, 30 Dec 2009 01:32:02 +0000 (02:32 +0100)
commitf42aa79cf95829eaa3e183ef268241c513016f38
treeff19d5e49d6ef2324ec06b265b0ba72cbb2cb137
parent716877660ff2b4c0387ba8bc11f0181d8da73fe2
parentdcf1543eb385f4effba5c2d54138c57b2ef84f89
Merge branch 'stable' into dual_socket
files/olsrd.conf.default.lq
files/olsrd.conf.default.lq-fisheye
src/cfgparser/olsrd_conf.c
src/olsr_cfg.h
src/olsr_protocol.h