[arrayfire] 12/29: Merge branch 'sift_scale' of git://github.com/pentschev/arrayfire into hotfixes-3.1.3

[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 bf7e205df8b11cea38e21327b0832b93811bd40b
Merge: 9f15ec2 f10dddc
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Mon Oct 5 17:37:49 2015 -0400

    Merge branch 'sift_scale' of git://github.com/pentschev/arrayfire into hotfixes-3.1.3

 src/backend/cpu/sift_nonfree.hpp           |  9 ++++-----
 src/backend/cuda/kernel/sift_nonfree.hpp   | 11 ++++++-----
 src/backend/opencl/kernel/sift_nonfree.cl  |  5 ++---
 src/backend/opencl/kernel/sift_nonfree.hpp |  4 ++--
 test/data                                  |  2 +-
 test/sift_nonfree.cpp                      |  6 +++++-
 6 files changed, 20 insertions(+), 17 deletions(-)

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