Merge branch 'develop' into libpng

This commit is contained in:
Paul Romano 2021-10-05 12:49:30 -05:00
commit 75b3d18446
29 changed files with 1405 additions and 150 deletions

View file

@ -62,7 +62,7 @@ master_doc = 'index'
# General information about the project.
project = 'OpenMC'
copyright = '2011-2021, Massachusetts Institute of Technology and OpenMC contributors'
copyright = '2011-2021, Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the

View file

@ -4,7 +4,8 @@
License Agreement
=================
Copyright © 2011-2021 Massachusetts Institute of Technology and OpenMC contributors
Copyright © 2011-2021 Massachusetts Institute of Technology, UChicago Argonne
LLC, and OpenMC contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in