[Olsr-commit] OLSR.org main repository branch, nhdp, updated. 514ad65c7cd084bf5fbd82ae5bee3e99f263cc98

[root]

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=commit;h=514ad65c7cd084bf5fbd82ae5bee3e99f263cc98
        for a web version of the last commit.

The branch, nhdp has been updated
       via  514ad65c7cd084bf5fbd82ae5bee3e99f263cc98 (commit)
       via  8d1d9d4e7aaf8793014374daf4b1c7ba36e6d14b (commit)
       via  321cb76765433ff451c79cd177cc5b902168ad89 (commit)
      from  82bc9c23922689fa355bda3d74bd6758a28f7393 (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 514ad65c7cd084bf5fbd82ae5bee3e99f263cc98
Author: Henning Rogge <(spam-protected)>
Date:   Sat Aug 7 13:47:05 2010 +0200

    Fix for automatic merge of master

commit 8d1d9d4e7aaf8793014374daf4b1c7ba36e6d14b
Merge: 82bc9c23922689fa355bda3d74bd6758a28f7393 321cb76765433ff451c79cd177cc5b902168ad89
Author: Henning Rogge <(spam-protected)>
Date:   Sat Aug 7 13:39:08 2010 +0200

    Merge branch 'master' into nhdp

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

Summary of changes:
 Makefile          |    2 +-
 src/bsd/net.c     |   16 ++++---
 src/ifnet.h       |    3 +-
 src/interfaces.c  |   76 +++++++++++++++++++++++++++++++++++-
 src/interfaces.h  |    5 ++
 src/linux/net.c   |   14 +++++++
 src/net_os.h      |    2 +
 src/olsr_cfg.h    |    3 +
 src/pbb_handler.c |    9 ++--
 src/unix/ifnet.c  |   86 +++++-----------------------------------
 src/win32/ifnet.c |  112 +++++++++++++++-------------------------------------
 src/win32/net.c   |   16 +++++---
 12 files changed, 167 insertions(+), 177 deletions(-)


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