Back-merge branch 'master' into dev (for fix in PR #1203)
authorJeff Donahue <jeff.donahue@gmail.com>
Wed, 1 Oct 2014 21:47:16 +0000 (14:47 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Wed, 1 Oct 2014 21:47:35 +0000 (14:47 -0700)
commitceb3011f1f8ab0f2841c9f4e84c16fa6d8609c0e
tree0d4476062215ce2a523011901205e6540d05174f
parentc76ba2880a08acac3ddd984924556d04241bc1f1
parent2fa2852d28a317dbdc3e9b7b0a829a4ad966ff7e
Back-merge branch 'master' into dev (for fix in PR #1203)
src/caffe/solver.cpp