Skip to content

Commit

Permalink
Merge pull request #1740 from abachma2/documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
gonuke committed Apr 30, 2024
2 parents 5353209 + 796f16e commit 7a77532
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ Since last release
resources (materials/products) (#1675). Can pop resources as packaged from resource buffer, pushing resource onto a buffer defaults to stripping packaging (#1683)
* CI support for Rocky Linux (#1691)
* Added support for a ResBuf to behave as a single bulk storage with mixing & extraction of resources (#1687)
* Removed deprecated `smbchk.py` ABI consistency checking functionality and tests (#1706). This functionality was
originally deprecated in #1396, and is removed in #1706 to clean up deprecated functionality
with the pending v1.6 release.
* Added ``--allow-milps`` flag into INSTALL.rst table (#1740)

**Changed:**

Expand All @@ -52,6 +50,9 @@ Since last release

* A duplicate `using std::list` in `src/hdf5_back.cc.in`, which triggers compiler
errors with some GCC versions. (#1560)
* Removed deprecated `smbchk.py` ABI consistency checking functionality and tests (#1706). This functionality was
originally deprecated in #1396, and is removed in #1706 to clean up deprecated functionality
with the pending v1.6 release.

**Fixed:**

Expand Down
5 changes: 4 additions & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ flags:
- where to place the build directory

* - ``--uninstall``
- uninstall
- uninstall

* - ``--allow-milps``
- build with COIN solvers

* - ``--no-update``
- do not update the hash in version.cc
Expand Down

0 comments on commit 7a77532

Please sign in to comment.