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.

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

[smart_holder] git merge master #5323

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Commits on Aug 21, 2024

  1. fix: never use .. in a header include (pybind#5321)

    * fix: never use `..` in a header include
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    * fix: one more parent include
    
    Signed-off-by: Henry Schreiner <[email protected]>
    
    ---------
    
    Signed-off-by: Henry Schreiner <[email protected]>
    henryiii committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    7d85baa View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8449595 View commit details
    Browse the repository at this point in the history