[asl] 88/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 bd0f3764f9a5f2714af73d0c9ef27a5b7935b465
Merge: a9298c3 0c876dc
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Fri Jul 10 11:41:20 2015 +0300

    Merge branch 'master' into develop

 CMakeLists.txt                                     |    23 +-
 README.md                                          |    20 +-
 ...fineFunctions.cmake => ASLBuildFunctions.cmake} |     0
 cmake/ASLBuildOptions.cmake                        |     4 +
 cmake/DefineOptions.cmake                          |     6 -
 doc/CMakeLists.txt                                 |    32 +-
 .../{Doxyfile.in => Doxyfile.cmake.in}             |     0
 examples/input_data/locomotive_in_tunnel.pvsm      | 12323 +++++++++++++++++++
 examples/input_data/multicomponent_flow.pvsm       |  5611 +++++++++
 src/CMakeLists.txt                                 |     2 +-
 src/utilities/aslMATLABCasters.h                   |     2 +-
 src/writers/aslMATFormat.h                         |     4 +-
 12 files changed, 17983 insertions(+), 44 deletions(-)

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