[Pkg-running-devel] [openambit] 114/131: Merge branch 'master' of https://github.com/openambitproject/openambit

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 7079f1751198e2e4a447520bc5984d9d66a74ce1
Merge: b89a1f6 d881659
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Tue May 27 22:38:40 2014 +0200

    Merge branch 'master' of https://github.com/openambitproject/openambit

 src/openambit/deployment/openambit.desktop |  2 +-
 wireshark_dissector/ambit-dissector.c      | 42 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 22 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git