Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
white238 committed Mar 21, 2024
2 parents 309b9c9 + 5f53159 commit d7aea21
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion RELEASE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*******************************************************************************

Axom: ................................, version 0.8.1
Axom: ................................, version 0.9.0

Copyright (c) 2017-2024, Lawrence Livermore National Security, LLC.
Produced at the Lawrence Livermore National Laboratory.
Expand Down
5 changes: 4 additions & 1 deletion RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/

## [Unreleased] - Release date yyyy-mm-dd

## [Version 0.9.0] - Release date 2024-03-19

### Added
- Primal: Adds a `Quadrilateral` primitive
- Primal: Adds a `compute_bounding_box()` operator for computing the bounding
Expand Down Expand Up @@ -1029,7 +1031,8 @@ fractions for the associated materials must be supplied before shaping.
- Use this section in case of vulnerabilities


[Unreleased]: https://github.com/LLNL/axom/compare/v0.8.1...develop
[Unreleased]: https://github.com/LLNL/axom/compare/v0.9.0...develop
[Version 0.9.0]: https://github.com/LLNL/axom/compare/v0.8.1...v0.9.0
[Version 0.8.1]: https://github.com/LLNL/axom/compare/v0.8.0...v0.8.1
[Version 0.8.0]: https://github.com/LLNL/axom/compare/v0.7.0...v0.8.0
[Version 0.7.0]: https://github.com/LLNL/axom/compare/v0.6.1...v0.7.0
Expand Down
4 changes: 2 additions & 2 deletions src/cmake/AxomVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
# otherwise, the hard-coded values will go in to the config.
#------------------------------------------------------------------------------
set(AXOM_VERSION_MAJOR 0)
set(AXOM_VERSION_MINOR 8)
set(AXOM_VERSION_PATCH 1)
set(AXOM_VERSION_MINOR 9)
set(AXOM_VERSION_PATCH 0)
string(CONCAT AXOM_VERSION_FULL
"v${AXOM_VERSION_MAJOR}"
".${AXOM_VERSION_MINOR}"
Expand Down

0 comments on commit d7aea21

Please sign in to comment.