[Olsr-commit] OLSR.org main repository branch, pud, updated. OLSRD_0_6_2-92-gd1e6f9c

[(spam-protected)]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OLSR.org main repository".

        See http://olsr.org/git/?p=olsrd.git;a=commitdiff;h=OLSRD_0_6_2-92-gd1e6f9c
        for a web version of the last commit.

The branch, pud has been updated
       via  d1e6f9c0a116c2b0a59659da0e6cb5efb30d098d (commit)
       via  195f9cf366ba1765b335e383ce7e3b207ae84ccd (commit)
       via  8f6076afb93d3664269d3a382adc16a094cff94f (commit)
       via  7071e6096eab0f75d79cd0627c01fa04b88334fd (commit)
      from  9563c8a941e91a094adc43c064cb1216552878ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d1e6f9c0a116c2b0a59659da0e6cb5efb30d098d
Merge: 9563c8a 195f9cf
Author: Ferry Huberts <(spam-protected)>
Date:   Tue Oct 18 12:08:07 2011 +0200

    Merge branch 'stable' into pud
    
    * stable:
      consolidate comments regarding if olsrd has to delete, or can rely on routes getting overwritten
      do not (falsely) rely on NLFM_REPLACE with fib_metric != FLAT
      spelling: it's 'receiving', not 'recieving'

-----------------------------------------------------------------------

Summary of changes:
 gui/linux-gtk/CHANGELOG           |    4 ++--
 gui/linux-gtk/src/ipc.c           |   20 ++++++++++----------
 lib/httpinfo/src/olsrd_httpinfo.c |    2 +-
 src/bsd/net.c                     |    2 +-
 src/linux/net.c                   |    4 ++--
 src/parser.c                      |    8 ++++----
 src/process_routes.c              |   11 ++++++++---
 src/win32/net.c                   |    4 ++--
 8 files changed, 30 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
OLSR.org main repository