[Olsr-commit] OLSR.org main repository branch, master, updated. v0.6.6.1-107-g7f384b3

[(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.6.1-107-g7f384b3
        for a web version of the last commit.

The branch, master has been updated
       via  7f384b319e58eac6ac7f6522d821b0fdda4cf5ce (commit)
       via  1ac8559e3f22bb8426617784dcd29d04e36db770 (commit)
       via  261e1237df8171fe9129828e43951fc3fecc9f35 (commit)
       via  1a5934636523eeebecf2775aca609306d96a651f (commit)
       via  371c4585b11bc0bbdc0b1b4be3c209d6eb519cfb (commit)
      from  5bfc121512d4393a9595bfb7574172a69836f43b (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 7f384b319e58eac6ac7f6522d821b0fdda4cf5ce
Merge: 1ac8559 1a59346
Author: Ferry Huberts <(spam-protected)>
Date:   Wed Nov 6 14:16:20 2013 +0100

    Merge branch 'release-0.6.6'
    
    * release-0.6.6:
      pud: fix java detection in the wireformat java bindings (again)

commit 1ac8559e3f22bb8426617784dcd29d04e36db770
Merge: 371c458 261e123
Author: Ferry Huberts <(spam-protected)>
Date:   Wed Nov 6 14:16:14 2013 +0100

    Merge branch 'release-0.6.5'
    
    * release-0.6.5:
      pud: fix java detection in the wireformat java bindings (again)

commit 371c4585b11bc0bbdc0b1b4be3c209d6eb519cfb
Author: Ferry Huberts <(spam-protected)>
Date:   Wed Nov 6 14:14:53 2013 +0100

    pud: fix java detection in the wireformat java bindings (again)
    
    Debian turns out to be a huge pain. Now I need to also check '-amd64'
    since Wheezy changed it again... sigh...
    
    Signed-off-by: Ferry Huberts <(spam-protected)>

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

Summary of changes:
 lib/pud/wireformat-java/Makefile |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)


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