[Olsr-commit] OLSR.org main repository branch, master, updated. v0.9.0.3-377-g4d4ae46

[(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=v0.9.0.3-377-g4d4ae46
        for a web version of the last commit.

The branch, master has been updated
       via  4d4ae468ffe23fc2df0046662bd93feb00e403b0 (commit)
       via  cdc0612912a18b30fb27d5616fe1759998908395 (commit)
      from  38441d3ec0328d993d5ce35442cd371d8bbc12a9 (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 4d4ae468ffe23fc2df0046662bd93feb00e403b0
Merge: cdc0612 38441d3
Author: Henning Rogge <(spam-protected)>
Date:   Wed Dec 9 11:54:02 2015 +0100

    Merge branch 'master' of git://olsr.org/olsrd

commit cdc0612912a18b30fb27d5616fe1759998908395
Author: Henning Rogge <(spam-protected)>
Date:   Wed Dec 9 11:51:49 2015 +0100

    Configuration file cleanup
    
    Rename "full" config file (its not full anymore, its default only)
    Add txtinfo to default configuration examples
    Add some more explanation to README

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

Summary of changes:
 files/README                                                  | 9 +++++++--
 files/{olsrd.conf.default.full => olsrd.conf.default}         | 8 +++++++-
 files/olsrd.conf.default.lq                                   | 8 +++++++-
 files/olsrd.conf.default.rfc                                  | 9 ++++++++-
 files/{olsrd.conf.default.full.txt => olsrd.conf.default.txt} | 0
 5 files changed, 29 insertions(+), 5 deletions(-)
 rename files/{olsrd.conf.default.full => olsrd.conf.default} (53%)
 rename files/{olsrd.conf.default.full.txt => olsrd.conf.default.txt} (100%)


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