Skip to content
Snippets Groups Projects
Commit cdbc39f2 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

Merge branch 'master' into develop

# Conflicts:
#	include/ITAFFT.h
#	include/ITAFFTDefinitions.h
#	include/ITAFFTUtils.h
#	src/FFTW3Backend.h
#	src/ITAFFTBackend.h
#	src/ITAFFTFactory.h
#	src/ITAFFTRealization.h
parents b4a0297f 18b6e0c8
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment