[caffe] 54/249: Merge branch 'master' into debian/experimental

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.

commit 5cbaacafafc9dd012bd7ea9a38a8771b5e4ed133
Merge: 691c834 18e5729
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Jul 30 01:36:13 2015 +0000

    Merge branch 'master' into debian/experimental

 .travis.yml                                    | 13 +++++--
 CMakeLists.txt                                 |  4 ++
 Makefile                                       |  4 +-
 cmake/Dependencies.cmake                       |  9 +++--
 docs/install_apt.md                            |  8 ++--
 docs/install_yum.md                            |  4 +-
 docs/installation.md                           |  2 +-
 docs/tutorial/interfaces.md                    | 14 +++----
 docs/tutorial/layers.md                        |  2 +-
 docs/tutorial/net_layer_blob.md                |  2 +-
 examples/cifar10/readme.md                     |  3 +-
 examples/feature_extraction/readme.md          |  2 +-
 examples/imagenet/readme.md                    |  2 +-
 include/caffe/layer.hpp                        |  2 +-
 include/caffe/loss_layers.hpp                  |  8 ++--
 python/caffe/test/test_net.py                  |  7 ++--
 python/caffe/test/test_net_spec.py             |  2 +-
 python/caffe/test/test_python_layer.py         |  5 ++-
 python/caffe/test/test_solver.py               |  7 ++--
 scripts/travis/travis_build_and_test.sh        | 11 +++++-
 scripts/travis/travis_install.sh               | 52 +++++++++++++++++++-------
 scripts/travis/travis_setup_makefile_config.sh |  4 +-
 src/caffe/layer_factory.cpp                    |  5 +++
 src/caffe/layers/absval_layer.cu               |  1 -
 24 files changed, 114 insertions(+), 59 deletions(-)

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