[asl] 136/177: Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

[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 1f8449a5fd5f87b0f704b41a03d7b7c5a56ea791
Merge: e82874f 2e87711
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Fri Jul 31 12:23:45 2015 +0300

    Merge branch 'master' of gitlab.com:AvtechScientific/ASL-dev

 CMakeLists.txt                         |  6 ++----
 NEWS.md                                |  2 +-
 README.md                              | 12 +++++++-----
 cmake/ASL.pc.cmake.in                  |  2 +-
 cmake/ASLBuildFunctions.cmake          | 10 ++++++++--
 cmake/ASLPaths.cmake                   |  3 +++
 examples/CMakeLists.txt                |  2 +-
 examples/elastic/CMakeLists.txt        |  5 -----
 examples/flow/CMakeLists.txt           | 13 -------------
 examples/flow/locomotive.cc            |  2 +-
 examples/flow/locomotive_laminar.cc    |  1 -
 examples/heatTransfer/CMakeLists.txt   |  1 -
 examples/jumpingObjects/CMakeLists.txt |  1 -
 examples/levelSet/CMakeLists.txt       |  3 ---
 examples/massTransferSM/CMakeLists.txt |  4 ----
 test/CMakeLists.txt                    |  2 ++
 16 files changed, 26 insertions(+), 43 deletions(-)

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