Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitFlow: Merge develop into main for release #339

Merged
merged 8 commits into from
Oct 26, 2023
Merged

GitFlow: Merge develop into main for release #339

merged 8 commits into from
Oct 26, 2023

Commits on Oct 25, 2023

  1. Add needed flag for icx builds

    @mathomp4
    mathomp4 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    e0cb6c0 View commit details
    Browse the repository at this point in the history

  2. Remove message

    @mathomp4
    mathomp4 committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    9aeb0a2 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Fixes for Intel Rosetta under Clang 15

    @mathomp4
    mathomp4 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    44f964e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #338 from GEOS-ESM/feature/mathomp4/intel-rosetta 

    Fixes for Intel Rosetta under Clang 15
    @mathomp4
    mathomp4 authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    e39a3e1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into bugfix/mathomp4/icx-flag

    @mathomp4
    mathomp4 authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    b483d97 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #337 from GEOS-ESM/bugfix/mathomp4/icx-flag 

    Add needed flag for icx builds
    @mathomp4
    mathomp4 authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    f0c548f View commit details
    Browse the repository at this point in the history

  5. Fix up CHANGELOG

    @mathomp4
    mathomp4 committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    07ac974 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into develop

    @mathomp4
    mathomp4 authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    aea4189 View commit details
    Browse the repository at this point in the history