biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1be8c2a 62bd979)
Merge branch release-2021 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Tue, 29 Jun 2021 07:54:40 +0000 (09:54 +0200)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 29 Jun 2021 07:54:40 +0000 (09:54 +0200)
commitba073be8c4094771c8899f2c0cc3ca2937720831
tree4fd84c10762a3299b410293611cacd7dd8015171tree | snapshot
parent1be8c2ab69cbcdfdea2dca33da77338a7fe8f3accommit | diff
parent62bd9797034ab67c041a1b57172391efe5742f12commit | diff
Merge branch release-2021 into master

Resolved Conflicts:
api/gmxapi/CMakeLists.txt
cmake/gmxGenerateVersionInfoWithoutGit.cmake
cmake/gmxManageClangCudaConfig.cmake
python_packaging/sample_restraint/src/cpp/CMakeLists.txt
python_packaging/src/CMakeLists.txt
python_packaging/src/gmxapi/export_system.cpp
python_packaging/src/gmxapi/version.py
python_packaging/src/setup.py
src/gromacs/applied_forces/awh/awh.cpp
src/gromacs/ewald/pme_gpu_program_impl.cu
src/gromacs/gmxana/gmx_dipoles.cpp
src/gromacs/tools/convert_tpr.cpp
14 files changed:
api/gmxapi/cpp/system.cpp diff1 | diff2 | blob | history
api/nblib/CMakeLists.txt diff1 | diff2 | blob | history
cmake/gmxVersionInfo.cmake diff1 | diff2 | blob | history
docs/reference-manual/topologies/topology-file-formats.rst diff1 | diff2 | blob | history
python_packaging/sample_restraint/CMakeLists.txt diff1 | diff2 | blob | history
python_packaging/src/CMakeLists.txt diff1 | diff2 | blob | history
python_packaging/src/gmxapi/export_system.cpp diff1 | diff2 | blob | history
src/gromacs/applied_forces/awh/awh.cpp diff1 | diff2 | blob | history
src/gromacs/domdec/domdec_constraints.cpp diff1 | diff2 | blob | history
src/gromacs/domdec/domdec_vsite.cpp diff1 | diff2 | blob | history
src/gromacs/domdec/ga2la.h diff1 | diff2 | blob | history
src/gromacs/domdec/partition.cpp diff1 | diff2 | blob | history
src/gromacs/mdlib/updategroupscog.cpp diff1 | diff2 | blob | history
src/gromacs/utility/pleasecite.cpp diff1 | diff2 | blob | history
Local GROMACS mirror with custom stuff