[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.7-30-g34a0e4a

[(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.6.7-30-g34a0e4a
        for a web version of the last commit.

The branch, master has been updated
       via  34a0e4a162d685ad0eff85127f3161dd02bc08c3 (commit)
       via  59347006762a4c85e478f4c42cb0ed2066d4893b (commit)
       via  4d48487c38b1879e4ef56bc7b01199a420f2e46e (commit)
       via  2d11820a6cd120b08739e46eba9e90b573f9b6f3 (commit)
       via  7c86adcf5efcbf152ff032e0ae9a8b559d64fe42 (commit)
       via  c953b70aa3da0d3a39ec0935d82f95c752b541ef (commit)
      from  d9d682a1533bc5d98dd136c69fb1a71b1adad89e (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 34a0e4a162d685ad0eff85127f3161dd02bc08c3
Merge: d9d682a 5934700
Author: Ferry Huberts <(spam-protected)>
Date:   Fri Oct 24 09:34:18 2014 +0200

    Merge branch 'release-0.6.7'
    
    * release-0.6.7:
      plugins: add a comment to clarify strange behaviour
      txtinfo: set_plugin_boolean stores into an int
      jsoninfo: set_plugin_boolean stores into an int
      android: fix build on 32 bit platform (see 0295e11)
      android: use the machine specific NDK instead of always the 32bit variant

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

Summary of changes:
 lib/jsoninfo/src/olsrd_jsoninfo.h |    2 +-
 lib/jsoninfo/src/olsrd_plugin.c   |    2 +-
 lib/txtinfo/src/olsrd_plugin.c    |    2 +-
 lib/txtinfo/src/olsrd_txtinfo.h   |    2 +-
 src/plugin_util.c                 |    3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)


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