Skip to content
  • Andrey Alekseenko's avatar
    2c94e868
    Merge 2023 into 2024 · 2c94e868
    Andrey Alekseenko authored
    Conflicts:
    
    - CITATION.cff
    - CMakeLists.txt
    - cmake/gmxVersionInfo.cmake
    - src/gromacs/mdrun/md.cpp
    - src/gromacs/mdrun/rerun.cpp
    
    Don't squash!
    
    Tagging @berkhess since the conflicts are between his changes.
    2c94e868
    Merge 2023 into 2024
    Andrey Alekseenko authored
    Conflicts:
    
    - CITATION.cff
    - CMakeLists.txt
    - cmake/gmxVersionInfo.cmake
    - src/gromacs/mdrun/md.cpp
    - src/gromacs/mdrun/rerun.cpp
    
    Don't squash!
    
    Tagging @berkhess since the conflicts are between his changes.
Loading