[Olsr-commit] OLSR.org main repository branch, master, updated. 463866b3ad699b224dc2c893306ba23a81a6189a

[www-data]

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=463866b3ad699b224dc2c893306ba23a81a6189a
        for a web version of the last commit.

The branch, master has been updated
       via  463866b3ad699b224dc2c893306ba23a81a6189a (commit)
       via  a7c03f5b74f568f1acdf42bb2425adc9b906148c (commit)
       via  64ffb55ce50cf4a038aa8be91f3dab1bbf47ed5d (commit)
       via  3e333f16ee05736540198bd9d8e77bc191990b8a (commit)
       via  6441bd5d815bb58dc3969fdb627b69083df864bc (commit)
       via  58717948f87a6290a9554929f397d71d3d8db077 (commit)
       via  cc6c16f46f023d402225f48c221377243eea8d7d (commit)
       via  db04bd9a3dd2ad1a0509e81ceb14dffe5fecd229 (commit)
       via  1413823e6a3bd96512b6fa883ff989280dea1838 (commit)
       via  b88f2213fa94557d2aecd759418f845e507f93aa (commit)
       via  dee47a3e19c7f66a8e244dfcbe48b600200a5634 (commit)
      from  98ac1158733c106fff56f39bd1eb1ad54de61f44 (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 463866b3ad699b224dc2c893306ba23a81a6189a
Merge: a7c03f5b74f568f1acdf42bb2425adc9b906148c 98ac1158733c106fff56f39bd1eb1ad54de61f44
Author: Henning Rogge <(spam-protected)>
Date:   Tue Mar 23 21:28:35 2010 +0100

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

commit a7c03f5b74f568f1acdf42bb2425adc9b906148c
Author: Henning Rogge <(spam-protected)>
Date:   Tue Mar 23 21:26:56 2010 +0100

    Fix comment for static http test site ACL

commit 64ffb55ce50cf4a038aa8be91f3dab1bbf47ed5d
Merge: 6fa77f416eea392a3a953dec9e8510ab1a6fa00b 3e333f16ee05736540198bd9d8e77bc191990b8a
Author: Henning Rogge <(spam-protected)>
Date:   Tue Mar 23 20:48:07 2010 +0100

    Merge branch 'http-server'

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

Summary of changes:
 Makefile.inc                    |    3 +-
 lib/txtinfo/src/olsrd_txtinfo.c |    2 +-
 src/olsr_comport.c              |  268 --------------------------
 src/olsr_comport.h              |    1 +
 src/olsr_comport_http.c         |  400 +++++++++++++++++++++++++++++++++++++--
 src/olsr_comport_http.h         |   41 ++++-
 src/olsr_comport_txt.c          |  112 +++++++++++
 src/olsr_comport_txt.h          |    2 +-
 8 files changed, 533 insertions(+), 296 deletions(-)


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