biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0bbb9b7 8e44d9c)
Merge branch release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 9 Jun 2015 12:41:38 +0000 (14:41 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 9 Jun 2015 12:45:08 +0000 (14:45 +0200)
commitcbabb80b5c08bb0a9b3170acdd8f70a8441485da
tree2c7dfe1be5ae05d8871bf00030700740f104a67ftree | snapshot
parent0bbb9b7331aa21072bd51641883fecdcc9f9b7f9commit | diff
parent8e44d9c7836a1b7856b2d13eac84b05c62039758commit | diff
Merge branch release-4-6 into release-5-0

Conflicts:
src/gromacs/gmxlib/copyrite.cpp
New citations in release-5-0 branch adjacent to incoming
ones; kept all citations
src/programs/mdrun/mdrun.cpp
New please_cite calls next to a line removed in release-5-0;
retained the calls.

Change-Id: I463a598e32ffa82ebdd66211feba84635bc962b5
README diff1 | diff2 | blob | history
src/gromacs/gmxlib/copyrite.cpp diff1 | | blob | history
src/programs/mdrun/mdrun.cpp diff1 | | blob | history
Local GROMACS mirror with custom stuff