Commit 49d20c8c authored by Max Lyon's avatar Max Lyon

Merge branch 'master' into CMakeSimplification

# Conflicts:
#	OpenFlipper
parents d09751f3 f6df1e0c
Pipeline #11007 passed with stages
in 36 minutes and 46 seconds
......@@ -237,3 +237,6 @@
[submodule "Plugin-Noise"]
path = Plugin-Noise
url = https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-Noise.git
[submodule "Plugin-VolumeMeshConvert"]
path = Plugin-VolumeMeshConvert
url = https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-VolumeMeshConvert.git
......@@ -60,7 +60,7 @@ echo "CPPCHECK Summary"
echo "=============================================================================="
echo -e "${NC}"
MAX_ERROR=80
MAX_ERROR=260
if [ $COUNT -gt $MAX_ERROR ]; then
echo -e ${WARNING}
......
Subproject commit 1210a46cd883495a11e0f8eda8fe7becb6b6b058
Subproject commit 5edb5a0557b45a37594afb1ee453806d11aea306
Subproject commit d08962e7778878f5aeae6f469b77116ad059dc53
Subproject commit 242b124a7baa7cf2feaa339f5e621976e60e5754
Subproject commit ba4cbcbf12f5589f1d6e22bbd884ff7db75146db
Subproject commit 253b915502a2bb0f62d79c9fdd358e07d8cae66d
Subproject commit f676da755eba6720b70273e50f9eacc92d84a9e6
Subproject commit cf2c39a123e3660dd29bc27ba1808c69a2f91a2b
Subproject commit 283a17021aa3b45a7897a8cca59ce034d5249239
Subproject commit 07d9a2e30d2d665f29dfb61160629649b4428644
Subproject commit bed1088c192c94f496602de99d75e5c780a51832
Subproject commit 895af93efefb9a7e841bd26007612b4d5ae0d10f
Subproject commit 1fa76ad8b68c3f6e732eee058f28047e76b84aef
Subproject commit 58cb63d0e6398b639ffe73c0cd16ed0c8bb88bc0
Subproject commit b85c29d54fa7d836eeab2e988746b56ee73a11bb
Subproject commit 7cca2abf3b78a88d159a7d5114b37f5be4bf78a2
Subproject commit 1218e1ffb6c75ecd6993ec850ddc7dec4bc9c622
Subproject commit 14846061edbd0352b80f1c23185eb9395c0fed1a
Subproject commit 8d4bc8ad6f892a364f9a7252fa7847fd414a3a54
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