[lua-torch-image] 02/07: Merge tag 'upstream/0_20170420-g5aa1881'

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository lua-torch-image.

commit 78d004844decaef81804fb113af459116082b441
Merge: bb65d36 01203fa
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat May 20 08:49:18 2017 +0000

    Merge tag 'upstream/0_20170420-g5aa1881'
    
    Upstream version 0~20170420-g5aa1881

 CMakeLists.txt  |  6 +++---
 generic/image.c | 31 +++++++++++++++++--------------
 generic/png.c   | 53 ++++++++++++++++++++++++++++++++++++++++-------------
 init.lua        | 37 ++++++++++++++++++++++++++++---------
 png.c           | 21 ++++++++++++++++++++-
 test/test.lua   | 13 +++++++++++++
 6 files changed, 121 insertions(+), 40 deletions(-)

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