[asl] 100/177: Merge branch 'master' into 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 cf54486b50628c4d8f9048e986932ff6dbc8d513
Merge: a19e7c2 76cb0a6
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Jul 15 15:04:28 2015 +0300

    Merge branch 'master' into develop

 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