[asl] 91/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 4173ee5b8fbcfea05c055b92602e927f537b90ea
Merge: 0c876dc 2aeee9c
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Jul 13 12:25:32 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt                        |  2 +-
 README.md                             | 21 +++++++-------
 cmake/ASLBuildOptions.cmake           |  2 +-
 examples/flow/locomotive_in_tunnel.cc | 52 +++++++++++++++++++++++++----------
 examples/flow/multicomponent_flow.cc  | 27 ++++++++----------
 5 files changed, 61 insertions(+), 43 deletions(-)

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