[asl] 101/177: Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

[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 72b74d2d34f47a6c6ebf312a8d04978d596697c6
Merge: 556cdfe 76cb0a6
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 15 15:05:29 2015 +0300

    Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

 examples/flow/locomotive_in_tunnel.cc  |  8 +++-----
 examples/flow/locomotive_laminar.cc    | 32 ++++++++++++++------------------
 src/utilities/aslParametersManager.cxx |  2 +-
 3 files changed, 18 insertions(+), 24 deletions(-)

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