Merge pull request #1261 from kmatzen/minor_changes
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 11 Oct 2014 21:44:59 +0000 (14:44 -0700)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Sat, 11 Oct 2014 21:44:59 +0000 (14:44 -0700)
[fix] build with OpenCV 3 and other minor fixes


Trivial merge