Merge branch 'master' into programmer-guide-updates

# Conflicts: # doc/lammps.1
2021-09-09 23:34:46 -04:00
parent 1ae15cf8b7 0dd35bdb66
commit 02da29513e
37 changed files with 358 additions and 287 deletions
--- a/doc/src/Developer_utils.rst
+++ b/doc/src/Developer_utils.rst
@ -206,6 +206,9 @@ Convenience functions
 Customized standard functions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+.. doxygenfunction:: binary_search
+   :project: progguide
+
 .. doxygenfunction:: merge_sort
   :project: progguide