Merge branch 'master' into develop

cburstedde · Oct 5, 2023 · d35e1dd · d35e1dd
2 parents 2101d14 + a743156
commit d35e1dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/doc/author_carlin.txt b/doc/author_carlin.txt
@@ -0,0 +1 @@
+I place my contributions to p4est under the FreeBSD license. Louis Carlin ([email protected])
diff --git a/doc/author_heister.txt b/doc/author_heister.txt
@@ -0,0 +1 @@
+I place my contributions to p4est under the FreeBSD license. Timo Heister ([email protected])
diff --git a/doc/author_hirsch.txt b/doc/author_hirsch.txt
@@ -0,0 +1 @@
+I place my contributions to p4est under the FreeBSD license - Michael Hirsch.