Merge remote-tracking branch 'bvlc/master' into dev
authorJeff Donahue <jeff.donahue@gmail.com>
Mon, 29 Sep 2014 21:16:58 +0000 (14:16 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Mon, 29 Sep 2014 21:16:58 +0000 (14:16 -0700)
commit91c30b7f7f8c143f8399137ff5a095e4838c713f
treef6a798fb68bf903430c91287ee9b53355e3caa02
parentc68f9ce858c98e94dc0aa18f07bb838af18192a0
parent94927d24ee5a6a5b0bd9cfda26abf2a6dc8373b8
Merge remote-tracking branch 'bvlc/master' into dev

Conflicts:
src/caffe/layers/hdf5_data_layer.cpp
src/caffe/layers/hdf5_data_layer.cpp
src/caffe/test/test_hdf5data_layer.cpp