Commit 3a4993a9 authored by Philipp Schäfer's avatar Philipp Schäfer
Browse files

Merge branch 'master' into develop

# Conflicts:
#	include/ITACTCDefinitions.h
#	include/ITANCTC.h
#	include/ITANCTCStreamFilter.h
parents 346d7ff4 8b734720
Copyright 2015-2017 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
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
......@@ -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.
......
Markdown is supported
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