biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
61ba45d
)
Merge release-5-0 into release-5-1
author
Teemu Murtola
<teemu.murtola@gmail.com>
Mon, 20 Jul 2015 04:15:46 +0000
(07:15 +0300)
committer
Teemu Murtola
<teemu.murtola@gmail.com>
Mon, 20 Jul 2015 04:16:22 +0000
(07:16 +0300)
Conflicts:
src/gromacs/gmxpreprocess/grompp.c (adjacent changes, took both)
Additionally, added a declaration for a variable in sasa.cpp that had
been removed from enclosing scopes.
Change-Id: I15c10ef00416aa1f791a58b97d79669efab9a1c5
No differences found
biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff