[arrayfire] 189/248: Merge remote-tracking branch 'upstream/devel' into homography

[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 80d49ebd292ff28d2a62e7dae046b276a5e57364
Merge: e5e954e 04153f9
Author: Peter Andreas Entschev <peter at arrayfire.com>
Date:   Tue Nov 3 20:41:30 2015 -0500

    Merge remote-tracking branch 'upstream/devel' into homography

 src/api/c/imageio2.cpp             | 2 +-
 src/api/c/surface.cpp              | 2 +-
 src/backend/cuda/kernel/shared.hpp | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

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