[asl] 97/177: Merge branch 'develop'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository asl.

commit e979df8307aa2f8779090a292a9151b1c99cfbdf
Merge: 71ed669 a19e7c2
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 15 13:30:46 2015 +0300

    Merge branch 'develop'

 examples/flow/locomotive_in_tunnel.cc | 10 +++++-----
 src/acl/aclHardware.cxx               | 25 +++++++++++++++++--------
 src/acl/aclHardware.h                 |  4 ++++
 test/testACL/testHardware.cc          |  2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git