Merge pull request #710 from geenux/dev
authorJeff Donahue <jeff.donahue@gmail.com>
Tue, 29 Jul 2014 21:10:56 +0000 (14:10 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Tue, 29 Jul 2014 21:10:56 +0000 (14:10 -0700)
commit8b7964b5b5ffa68d508b2f62714c9f251a8e240a
tree79e2c9767851dafc2d2779d865885517b7b1254e
parent16b7b2547ad7b1f0459e931d221aca63aefabadb
parent57d7ecbc464c36cbf635ebb8bc510b003f7944f1
Merge pull request #710 from geenux/dev

Cleanup pthread code for data layers
src/caffe/layers/image_data_layer.cpp