biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6369422 2302582)
Merge branch release-2018 into release-2019
authorPaul Bauer <paul.bauer.q@gmail.com>
Mon, 17 Dec 2018 08:58:48 +0000 (09:58 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Mon, 17 Dec 2018 08:58:48 +0000 (09:58 +0100)
Resolved Conflicts:
src/gromacs/ewald/pme-solve.cu
src/gromacs/mdlib/clincs.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/tests/CMakeLists.txt

Change-Id: I813b4ed7ecf8056db09ab749c367a3b5e204e701


Trivial merge
Local GROMACS mirror with custom stuff