[Olsr-commit] OLSR.org main repository branch, GSOC, updated. OLSRD_0_6_1-24-g011ae02

[(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=commit;h=OLSRD_0_6_1-24-g011ae02
        for a web version of the last commit.

The branch, GSOC has been updated
       via  011ae0255b7c09abfe4dfedc3a1f2008f014c712 (commit)
       via  c94109e48fbfbaf82538fac7f31cb22a4d51bdbc (commit)
       via  1de2c7d61efe475874138d474eb1c31d498d5be3 (commit)
       via  17a4c755e3e85774815c5338ab65f957c862897e (commit)
      from  3fa69690dc618007480bd6141e0a230ed0cf8c5e (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 011ae0255b7c09abfe4dfedc3a1f2008f014c712
Merge: 3fa6969 c94109e
Author: Markus Kittenberger <(spam-protected)>
Date:   Mon Apr 25 20:41:37 2011 +0200

    Merge commit 'c94109e48fbfbaf82538fac7f31cb22a4d51bdbc' into GSOC

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

Summary of changes:
 src/scheduler.c |    7 +++++++
 src/win32/net.c |   18 +++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)


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