[arrayfire] 57/248: Merge pull request #1001 from arrayfire/hotfixes-3.1.2

[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 cb547320ea246eac163c03029322f712a22d62ab
Merge: 2d75672 a9e33bc
Author: Pavan Yalamanchili <pavan at arrayfire.com>
Date:   Tue Sep 15 10:13:06 2015 -0400

    Merge pull request #1001 from arrayfire/hotfixes-3.1.2
    
    Hotfixes 3.1.2

 CMakeModules/Version.cmake    |  2 +-
 include/af/dim4.hpp           |  6 +++---
 src/api/c/assign.cpp          |  2 +-
 src/api/c/convolve.cpp        | 44 ++++++++++++++++++++++---------------------
 src/backend/cuda/platform.cpp |  4 ++++
 5 files changed, 32 insertions(+), 26 deletions(-)

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