Skip to content
Snippets Groups Projects
Commit d4370802 authored by Mark Winter's avatar Mark Winter
Browse files

Merge branch 'master' into leverjs

# Conflicts:
#	src/MATLAB/+HIP/@Cuda/CheckConfig.m
#	src/MATLAB/+HIP/@Cuda/Closure.m
#	src/MATLAB/+HIP/@Cuda/Cuda.m
#	src/MATLAB/+HIP/@Cuda/DeviceCount.m
#	src/MATLAB/+HIP/@Cuda/DeviceStats.m
#	src/MATLAB/+HIP/@Cuda/ElementWiseDifference.m
#	src/MATLAB/+HIP/@Cuda/EntropyFilter.m
#	src/MATLAB/+HIP/@Cuda/Gaussian.m
#	src/MATLAB/+HIP/@Cuda/GetMinMax.m
#	src/MATLAB/+HIP/@Cuda/Help.m
#	src/MATLAB/+HIP/@Cuda/HighPassFilter.m
#	src/MATLAB/+HIP/@Cuda/IdentityFilter.m
#	src/MATLAB/+HIP/@Cuda/Info.m
#	src/MATLAB/+HIP/@Cuda/LoG.m
#	src/MATLAB/+HIP/@Cuda/MaxFilter.m
#	src/MATLAB/+HIP/@Cuda/MeanFilter.m
#	src/MATLAB/+HIP/@Cuda/MedianFilter.m
#	src/MATLAB/+HIP/@Cuda/Mex.mexa64
#	src/MATLAB/+HIP/@Cuda/Mex.mexw64
#	src/MATLAB/+HIP/@Cuda/MinFilter.m
#	src/MATLAB/+HIP/@Cuda/MultiplySum.m
#	src/MATLAB/+HIP/@Cuda/NLMeans.m
#	src/MATLAB/+HIP/@Cuda/Opener.m
#	src/MATLAB/+HIP/@Cuda/StdFilter.m
#	src/MATLAB/+HIP/@Cuda/Sum.m
#	src/MATLAB/+HIP/@Cuda/VarFilter.m
#	src/MATLAB/+HIP/@Cuda/WienerFilter.m
#	src/MATLAB/+HIP/CheckConfig.m
#	src/MATLAB/+HIP/Closure.m
#	src/MATLAB/+HIP/ElementWiseDifference.m
#	src/MATLAB/+HIP/EntropyFilter.m
#	src/MATLAB/+HIP/Gaussian.m
#	src/MATLAB/+HIP/GetMinMax.m
#	src/MATLAB/+HIP/Help.m
#	src/MATLAB/+HIP/HighPassFilter.m
#	src/MATLAB/+HIP/IdentityFilter.m
#	src/MATLAB/+HIP/Info.m
#	src/MATLAB/+HIP/LoG.m
#	src/MATLAB/+HIP/MaxFilter.m
#	src/MATLAB/+HIP/MeanFilter.m
#	src/MATLAB/+HIP/MedianFilter.m
#	src/MATLAB/+HIP/MinFilter.m
#	src/MATLAB/+HIP/MultiplySum.m
#	src/MATLAB/+HIP/NLMeans.m
#	src/MATLAB/+HIP/Opener.m
#	src/MATLAB/+HIP/StdFilter.m
#	src/MATLAB/+HIP/Sum.m
#	src/MATLAB/+HIP/VarFilter.m
#	src/MATLAB/+HIP/WienerFilter.m
#	src/Python/HIP.pyd
#	src/c/CudaImageProccessing.sln
#	src/c/CudaImageProcessor.vcxproj
#	src/c/CudaMex.vcxproj
#	src/c/CudaMex.vcxproj.filters
#	src/c/CudaPy3DLL.vcxproj
#	src/c/CudaPy3DLL.vcxproj.filters
#	src/c/CudaVersionImport.props
#	src/c/HIP.so
#	src/c/Mex.mexa64
#	src/c/Mex.mexw64
#	src/c/ScriptCmds/ScopedProcessMutex.h
#	src/c/makefile
parents 1512bc65 90884803
No related branches found
No related tags found
No related merge requests found
Showing
with 81 additions and 138 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment