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)
commit540ad6b1081fd47844e0400bf12ad4abb0b8ec37
tree743a4db9211edc57a4cf704098843090c16a62c0
parentc90d243d3672dc4b09e791eb99e8e5d81313c225
parent94394a059c5b0440590f561a594b84c271bc3154
Merge pull request #1261 from kmatzen/minor_changes

[fix] build with OpenCV 3 and other minor fixes