merge with master

Author: MelchiorSchuh

include/geode/inspector/criterion/degeneration/solid_degeneration.h

@@ -56,4 +56,4 @@ namespace geode
         IMPLEMENTATION_MEMBER( impl_ );
     };
     ALIAS_2D_AND_3D( SolidMeshDegeneration );
-} // namespace geode
+} // namespace geode