Commit 05e981f0 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

Merge branch 'master' into develop

# Conflicts:
#	apps/ita_convoi/ita_convoi.cpp
#	include/ITAConvolutionDefinitions.h
#	include/ITADirectConvolution.h
#	include/ITAUPConvolution.h
#	include/ITAUPFilter.h
#	include/ITAUPFilterPool.h
#	include/ITAUPTrigger.h
parents 5057a592 0395a5ca
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"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License. you may not use files of this project except in compliance with the License.
......
...@@ -7,7 +7,7 @@ ITAConvolution is a component of [ITACoreLibs](https://git.rwth-aachen.de/ita/IT ...@@ -7,7 +7,7 @@ ITAConvolution is a component of [ITACoreLibs](https://git.rwth-aachen.de/ita/IT
### License ### 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"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use files of this project except in compliance with the License. you may not use files of this project except in compliance with the License.
......
Copyright 2015-2017 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors. Copyright 2015-2020 Institute of Technical Acoustics, RWTH Aachen University. Any usage and distribution is prohibited, unless explicitly granted by the authors.
\ No newline at end of file \ No newline at end of file
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ITA core libs * ITA core libs
* (c) Copyright Institute of Technical Acoustics (ITA) * (c) Copyright Institute of Technical Acoustics (ITA)
* RWTH Aachen University, Germany, 2015-2019 * RWTH Aachen University, Germany, 2015-2020
* *
* ---------------------------------------------------------------- * ----------------------------------------------------------------
* ____ __________ _______ * ____ __________ _______
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment