[arrayfire] 17/79: Merge remote-tracking branch 'upstream/hotfixes-3.0.1' into vision_docs

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository arrayfire.

commit 7e5e1d108d4ff0ab42d19301d4c23927196894cc
Merge: a3cfd81 b53cb90
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date:   Thu Jun 4 16:28:07 2015 -0400

    Merge remote-tracking branch 'upstream/hotfixes-3.0.1' into vision_docs

 CPack.txt                       | 11 ++++++-----
 include/af/defines.h            |  4 ----
 src/backend/ArrayInfo.hpp       |  1 +
 src/backend/cpu/math.cpp        |  1 +
 src/backend/cuda/CMakeLists.txt |  4 ++--
 src/backend/cuda/math.hpp       |  1 +
 src/backend/defines.hpp         | 21 +++++++++++++++++++++
 src/backend/opencl/traits.hpp   |  1 +
 test/array.cpp                  |  2 +-
 test/constant.cpp               |  2 +-
 test/diagonal.cpp               |  6 +++---
 test/getting_started.cpp        |  2 +-
 test/matrix_manipulation.cpp    |  2 +-
 test/median.cpp                 |  2 +-
 14 files changed, 41 insertions(+), 19 deletions(-)

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