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)
Cleanup pthread code for data layers

1  2 
src/caffe/layers/image_data_layer.cpp

Simple merge