[asl] 70/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 845613d8fa968f2d80cd51352bae859a0b27b001
Merge: ee142c0 aee263c
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Jul 6 13:25:34 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt                        | 73 ++++++++++++++++++++++-------------
 README.md                             |  9 +++--
 cmake/ASL.pc.cmake.in                 | 11 ++++++
 cmake/DefineFunctions.cmake           |  4 ++
 doc/CMakeLists.txt                    |  2 +-
 examples/flow/locomotive_in_tunnel.cc | 64 ++++++++++++++++++++++--------
 src/CMakeLists.txt                    |  4 +-
 src/acl/Operators/CMakeLists.txt      |  1 -
 src/acl/aclMath/CMakeLists.txt        |  2 -
 src/doxygenDefinitions.h              |  2 +-
 10 files changed, 118 insertions(+), 54 deletions(-)

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