BioD PNPI Git Repos - alexxy/gromacs.git/commit - src/gromacs/topology/idef.cpp

biod.pnpi.spb.ru / alexxy / gromacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3e9cdd2 fea9381)

author	Paul Bauer <paul.bauer.q@gmail.com>
	Tue, 7 Jan 2020 13:09:57 +0000 (14:09 +0100)
committer	Paul Bauer <paul.bauer.q@gmail.com>
	Tue, 7 Jan 2020 13:09:57 +0000 (14:09 +0100)
commit	5f199ddc3d0e62ce04f2e19d03aff96d22d1adce
tree	6b4348dcc76e38997c405fe8c51a6d736beae07b	tree \| snapshot
parent	3e9cdd24f55e8600ade1c426e2532ed33c947be2	commit \| diff
parent	fea93810335c01acca5ed53fd1d98b85b9a8351e	commit \| diff

Merge branch origin/release-2020 into master

Final merge needed for release-2020 into master

Change-Id: I93a44684f002997dfa8590c865103b436f3e3e93

16 files changed:

admin/builds/gromacs.py	diff1 \|	diff2 \|	blob \| history
cmake/gmxVersionInfo.cmake	diff1 \|	diff2 \|	blob \| history
docs/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
docs/release-notes/index.rst	diff1 \|	diff2 \|	blob \| history
docs/user-guide/environment-variables.rst	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tests/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/gromacs/fileio/tests/fileioxdrserializer.cpp	\|	diff2 \|	blob \| history
src/gromacs/gmxpreprocess/topio.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/listed_forces/bonded.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/lincs_cuda.cu	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdlib/sim_util.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/mdrun/runner.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/decidegpuusage.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/taskassignment/decidegpuusage.h	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/inmemoryserializer.cpp	diff1 \|	diff2 \|	blob \| history
src/gromacs/utility/tests/inmemoryserializer.cpp	diff1 \|	diff2 \|	blob \| history

Local GROMACS mirror with custom stuff