Merge pull request #1236 from mlapin/legacy_nvcc_support
authorEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 16 Jan 2015 05:04:43 +0000 (21:04 -0800)
committerEvan Shelhamer <shelhamer@imaginarynumber.net>
Fri, 16 Jan 2015 05:04:43 +0000 (21:04 -0800)
commit7695db9000a66127facb6ecd52a355b9153f1440
treeb5ce54fa1258d0b1cc48cfd3d69fa97c1197c720
parent51f058f44341e20bfd51937326e3ee12713b3780
parentc211fd01ed62c8279ffc810e4f4d1ab2f0b93366
Merge pull request #1236 from mlapin/legacy_nvcc_support

Drop OpenCV includes from NVCC code for legacy reasons.
Makefile
include/caffe/data_transformer.hpp