[asl] 29/177: Merge

[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 69b7992169f80ac177c896dda375654433a1d6dc
Merge: d1275af 54d745c
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Sun Jun 14 13:40:06 2015 +0300

    Merge

 CMakeLists.txt                  |   7 ++++---
 DefineFunctions.cmake           |   2 +-
 DefineOptions.cmake             |   1 +
 src/pics/grids/linearS.png      | Bin 0 -> 4805 bytes
 src/pics/grids/probeD1Q2.png    | Bin 0 -> 4886 bytes
 src/pics/grids/probeD2Q3.png    | Bin 0 -> 8966 bytes
 src/pics/grids/probeD3Q4.png    | Bin 0 -> 18937 bytes
 src/pics/grids/quadraticS.png   | Bin 0 -> 4568 bytes
 src/pics/grids/qubicS.png       | Bin 0 -> 4363 bytes
 src/pics/grids/qubicS1.png      | Bin 0 -> 4890 bytes
 src/pics/grids/t2.png           | Bin 0 -> 4514 bytes
 src/pics/grids/t4.png           | Bin 0 -> 10593 bytes
 src/pics/grids/t6.png           | Bin 0 -> 16144 bytes
 src/pics/grids/t9.png           | Bin 0 -> 11929 bytes
 src/utilities/aslVTKCasters.cxx |  42 ++++++----------------------------------
 15 files changed, 12 insertions(+), 40 deletions(-)

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