[Commotion-admin] [olsrd] Merge remote-tracking branch 'olsr/release-0.6.6' into commotion (#22)

[Ben West]

Here is olsr/release-0.6.6 from git://olsr.org/olsrd.git merged into commotion branch for your review
You can merge this Pull Request by running:

  git pull https://github.com/westbywest/olsrd commotion

Or you can view, comment on it, or merge it online at:

  https://github.com/opentechinstitute/olsrd/pull/22

-- Commit Summary --

  * Merge remote-tracking branch 'olsr/release-0.6.6' into commotion

-- File Changes --

    M CHANGELOG (204)
    M Makefile (50)
    M Makefile.inc (16)
    M README-Olsr-Extensions (42)
    M contrib/netsimpcap/src/netsimpcap.c (4)
    M doc/Makefile (20)
    M files/olsrd.conf.commotion (19)
    M files/olsrd.conf.default.full (54)
    M files/olsrd.conf.default.lq (54)
    M files/olsrd.conf.default.lq-fisheye (54)
    A files/olsrd.ufw.profile (4)
    A files/sgw_policy_routing_setup.sh (177)
    M gui/linux-gtk/Makefile (11)
    M gui/linux-gtk/src/main.c (2)
    M gui/win32/Inst/installer.nsi (2)
    M gui/win32/Main/Frontend.rc (2)
    M lib/arprefresh/README_ARPREFRESH (6)
    M lib/arprefresh/src/olsrd_arprefresh.c (51)
    M lib/bmf/Makefile (2)
    M lib/dot_draw/README_DOT_DRAW (4)
    M lib/dyn_gw/Makefile (5)
    M lib/dyn_gw/src/olsrd_dyn_gw.c (3)
    M lib/httpinfo/src/olsrd_httpinfo.c (3)
    M lib/jsoninfo/src/olsrd_jsoninfo.c (28)
    M lib/mdns/Makefile (18)
    M lib/mdns/src/NetworkInterfaces.c (4)
    M lib/mdns/src/RouterElection.c (1)
    M lib/mdns/src/container_of.h (2)
    M lib/mdns/src/mdns.c (5)
    M lib/p2pd/Makefile (18)
    M lib/p2pd/src/p2pd.c (1)
    M lib/pud/doc/pud.odt (0)
    M lib/pud/nmealib/Makefile (2)
    M lib/pud/nmealib/Makefile.inc (15)
    M lib/pud/nmealib/src/parse.c (69)
    M lib/pud/nmealib/src/tok.c (17)
    M lib/pud/src/configTools.c (9)
    M lib/pud/src/configuration.c (5)
    M lib/pud/src/netTools.h (23)
    M lib/pud/src/pud.c (3)
    M lib/pud/src/uplinkGateway.c (14)
    M lib/pud/wireformat-java/Makefile (34)
    M lib/pud/wireformat/Makefile (14)
    M lib/quagga/README_QUAGGA (4)
    M lib/quagga/src/common.h (7)
    M lib/quagga/src/plugin.c (7)
    M lib/quagga/src/quagga.c (4)
    M lib/txtinfo/README_TXTINFO (1)
    M lib/txtinfo/src/olsrd_txtinfo.c (1)
    M make/Makefile.win32 (4)
    M make/hash_source.sh (10)
    M src/bsd/dummy.c (5)
    A src/builddata.h (48)
    M src/cfgparser/cfgfile_gen.c (83)
    M src/cfgparser/olsrd_conf.c (137)
    M src/cfgparser/oparse.y (132)
    M src/cfgparser/oscan.lex (35)
    M src/defs.h (4)
    M src/gateway.c (780)
    M src/gateway.h (12)
    M src/gateway_default_handler.c (208)
    A src/gateway_list.c (187)
    A src/gateway_list.h (152)
    M src/kernel_routes.h (2)
    M src/kernel_tunnel.h (2)
    M src/linux/kernel_routes_nl.c (4)
    M src/linux/kernel_tunnel.c (22)
    M src/lq_packet.c (10)
    M src/main.c (29)
    M src/neighbor_table.c (9)
    M src/olsr.c (1)
    M src/olsr_cfg.h (25)
    M src/olsr_switch/main.c (8)
    M src/process_package.c (20)
    M src/scheduler.c (2)
    M src/win32/arpa/inet.h (2)
    M src/win32/compat.c (2)
    M src/win32/dummy.c (5)

-- Patch Links --

https://github.com/opentechinstitute/olsrd/pull/22.patch
https://github.com/opentechinstitute/olsrd/pull/22.diff

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/olsrd/pull/22
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140424/5c9fb6a3/attachment.html>