[arrayfire] 34/34: Merge tag 'upstream/v3.1.2' into dfsg-clean

[Ghislain Vaillant]

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

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

commit 6f09650326548c3d248b0a70edde72b728f80d73
Merge: 9208992 77128bb
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sat Sep 26 23:07:56 2015 +0100

    Merge tag 'upstream/v3.1.2' into dfsg-clean

 CMakeModules/Version.cmake                         |  2 +-
 CMakeModules/build_forge.cmake                     |  2 +-
 CMakeModules/osx_install/cpu_scripts/postinstall   |  6 +--
 CMakeModules/osx_install/cuda_scripts/postinstall  |  4 +-
 .../osx_install/opencl_scripts/postinstall         |  4 +-
 docs/CMakeLists.txt                                |  2 +-
 docs/details/array.dox                             | 13 +----
 docs/pages/README.md                               | 32 ++++++-------
 docs/pages/release_notes.md                        | 24 ++++++++++
 docs/pages/using_on_linux.md                       |  2 +-
 docs/pages/using_on_osx.md                         |  2 +-
 include/af/defines.h                               |  4 +-
 include/af/dim4.hpp                                |  6 +--
 include/arrayfire.h                                | 56 ++++++++++++++--------
 src/api/c/assign.cpp                               |  2 +-
 src/api/c/convolve.cpp                             | 44 +++++++++--------
 src/api/c/histogram.cpp                            | 20 ++++----
 src/backend/cpu/histogram.cpp                      |  8 ++--
 src/backend/cpu/histogram.hpp                      |  2 +-
 src/backend/cpu/platform.cpp                       |  4 +-
 src/backend/cuda/histogram.cu                      | 19 ++------
 src/backend/cuda/histogram.hpp                     |  2 +-
 src/backend/cuda/kernel/histogram.hpp              | 33 +++++--------
 src/backend/cuda/kernel/ireduce.hpp                | 11 +++++
 src/backend/cuda/kernel/reduce.hpp                 | 11 ++---
 src/backend/cuda/platform.cpp                      |  4 ++
 src/backend/opencl/histogram.cpp                   | 19 ++------
 src/backend/opencl/histogram.hpp                   |  2 +-
 src/backend/opencl/kernel/histogram.cl             | 24 ++++------
 src/backend/opencl/kernel/histogram.hpp            | 15 +++---
 src/backend/opencl/kernel/iops.cl                  | 24 +++++++++-
 src/backend/opencl/kernel/ireduce.hpp              | 15 +++++-
 src/backend/opencl/kernel/reduce.hpp               | 12 ++---
 test/blas.cpp                                      | 37 +++++++-------
 test/histogram.cpp                                 | 19 ++++++++
 test/info.cpp                                      | 36 +++++++++-----
 test/ireduce.cpp                                   | 22 +++++++++
 test/median.cpp                                    | 25 +++++++++-
 test/reduce.cpp                                    | 25 +++++++++-
 39 files changed, 370 insertions(+), 224 deletions(-)

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