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

Merge branch 'master' into develop

# Conflicts:
#	include/ITABiquad.h
#	include/ITADSP/PD/JetEngine.h
#	include/ITADSP/ThirdOctaveFilterbank/IIRBurg.h
#	include/ITADSPDefinitions.h
#	include/ITAIIRCoefficients.h
#	include/ITAIIRFilterEngine.h
#	include/ITAIIRFilterGenerator.h
#	include/ITAIIRUtils.h
#	include/ITASIMOVariableDelayLine.h
#	include/ITASIMOVariableDelayLineBase.h
#	include/ITAThirdOctaveFIRFilterGenerator.h
#	include/ITAThirdOctaveFilterbank.h
#	include/ITAThirdOctaveFilterbankFIR.h
#	include/ITAThirdOctaveFilterbankIIR.h
#	include/ITAVariableDelayLine.h
#	src/ITAThirdOctaveFilterbankFIR.cpp
#	tests/dspfilters/NativeDspFiltersTest.cpp
#	tests/filtering/iir/ITADSPBiquadTest.cpp
#	tests/filtering/iir/ITADSPIIRFilterTest.cpp
#	tests/generators/ITADSPIIRFilterGeneratorTest.cpp
#	tests/vdl/ITADSPSIMOVDLSourceInShoebox.cpp
#	tests/vdl/ITADSPSIMOVDLTest.cpp
#	tests/vdl/ITASIMOVariableDelayLineBaseTest.cpp
parents 0cb0f53b 8f008edf
Branches
Tags v2021.a
No related merge requests found
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University
Copyright 2015-2020 Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......
......@@ -6,7 +6,7 @@ It is a component of [ITACoreLibs](https://git.rwth-aachen.de/ita/ITACoreLibs),
### License
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University
Copyright 2015-2020 Institute of Technical Acoustics, RWTH Aachen University
Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License.
......
......@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2019
* RWTH Aachen University, Germany, 2015-2020
*
* ----------------------------------------------------------------
* ____ __________ _______
......
......@@ -3,7 +3,7 @@
*
* ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2019
* RWTH Aachen University, Germany, 2015-2020
*
* ----------------------------------------------------------------
* ____ __________ _______
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment