Skip to content

Commit

Permalink
Merge pull request #72 from LLNL/master
Browse files Browse the repository at this point in the history
Bring develop up-to-date with master
  • Loading branch information
gzagaris committed Aug 8, 2019
2 parents 9592cbc + cbefc04 commit 5ce2197
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at blt-dev@llnl.gov. All
reported by contacting the project team at axom-dev@llnl.gov. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
18 changes: 16 additions & 2 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,20 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/

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

### Added

### Removed

### Deprecated

### Changed

### Fixed

### Known Bugs

## [Version 0.3.1] - Release date 2019-07-22

### Added
- Added a new implementation of the Bounding Volume Hierarchy(BVH) spatial
acceleration data-structure to spin. The new BVH implementation relies on RAJA
Expand Down Expand Up @@ -217,8 +231,8 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
### Known Bugs
-


[Unreleased]: https://github.com/LLNL/axom/compare/v0.3.0...develop
[Unreleased]: https://github.com/LLNL/axom/compare/v0.3.1...develop
[Version 0.3.1]: https://github.com/LLNL/axom/compare/v0.3.0...v0.3.1
[Version 0.3.0]: https://github.com/LLNL/axom/compare/v0.2.9...v0.3.0
[Version 0.2.9]: https://github.com/LLNL/axom/compare/v0.2.8...v0.2.9

Expand Down
4 changes: 2 additions & 2 deletions src/cmake/AxomVersion.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
## otherwise, the hard-coded values will go in to the config.
set(AXOM_VERSION_MAJOR 0)
set(AXOM_VERSION_MINOR 3)
set(AXOM_VERSION_PATCH 0)
string(CONCAT AXOM_VERSION_FULL
set(AXOM_VERSION_PATCH 1)
string(CONCAT AXOM_VERSION_FULL
"v${AXOM_VERSION_MAJOR}"
".${AXOM_VERSION_MINOR}"
".${AXOM_VERSION_PATCH}" )
Expand Down

0 comments on commit 5ce2197

Please sign in to comment.