Merge pull request #1966 from philkr/python_fixes
authorJon Long <jonlong@cs.berkeley.edu>
Wed, 4 Mar 2015 11:33:13 +0000 (03:33 -0800)
committerJon Long <jonlong@cs.berkeley.edu>
Wed, 4 Mar 2015 11:33:13 +0000 (03:33 -0800)
cmake and python3 bugfixes for #1939 and #1923

1  2 
python/caffe/pycaffe.py

Simple merge