[asl] 162/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 8a6046c488f8186932013e93f7a952669bf45dda
Merge: a665de0 e5e2c56
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Sun Aug 16 16:01:12 2015 +0300

    Merge branch 'master' into develop

 CMakeLists.txt                                     |  15 +++++++------
 COPYRIGHT.md                                       |   2 +-
 README.md                                          |   4 ++--
 cmake/ASLBuildFunctions.cmake                      |   2 +-
 doc/CMakeLists.txt                                 |   2 +-
 examples/CMakeLists.txt                            |   4 ++--
 .../input_data => input_data}/axial-compressor.stl | Bin
 {examples/input_data => input_data}/brain.vti      | Bin
 {examples/input_data => input_data}/bus.stl        | Bin
 .../input_data => input_data}/locomotive.pvsm      |   0
 {examples/input_data => input_data}/locomotive.stl | Bin
 .../multicomponent_flow.pvsm                       |   0
 src/CMakeLists.txt                                 |   4 +++-
 src/acl/CMakeLists.txt                             |   2 +-
 src/acl/aclTypes.h                                 |   2 +-
 src/acl/aclTypesList.h                             |   3 +--
 src/acl/aclUtilities.cxx                           |   2 +-
 src/acl/aclUtilities.h                             |   4 +---
 src/aslUtilities.cxx                               |  19 ++++++++++------
 src/numExtend/CMakeLists.txt                       |   2 +-
 test/testACL/CMakeLists.txt                        |  14 ++++++------
 test/testAGL/CMakeLists.txt                        |   7 +++++-
 test/testAGL/testVTK_IO.cc                         |  24 ++++++++++++---------
 test/testMath/CMakeLists.txt                       |   2 ++
 24 files changed, 67 insertions(+), 47 deletions(-)

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