[arrayfire] 16/29: Merge remote-tracking branch 'upstream/hotfixes-3.1.3' into sift_tests

[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 8d0ac0a0e905a8d7f3c97bce65d47926eb9f907e
Merge: b931609 bf7e205
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date:   Tue Oct 6 22:04:30 2015 -0400

    Merge remote-tracking branch 'upstream/hotfixes-3.1.3' into sift_tests

 CMakeModules/FindOpenCL.cmake | 34 ++++++++++++++++++++++++++++------
 src/backend/cuda/driver.cpp   |  2 +-
 src/backend/cuda/platform.cpp |  3 ++-
 3 files changed, 31 insertions(+), 8 deletions(-)

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