Commit 50f05fd2 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'master' of https://git.rwth-aachen.de/ita/ITAConvolution

# Conflicts:
#	README.md
parents 37355f3e 205c8d38
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