biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
203fb41
)
Merge branch release-5-0 into release-5-1
author
Mark Abraham
<mark.j.abraham@gmail.com>
Sun, 26 Jul 2015 11:51:46 +0000
(13:51 +0200)
committer
Mark Abraham
<mark.j.abraham@gmail.com>
Sun, 26 Jul 2015 11:54:54 +0000
(13:54 +0200)
Conflicts:
CMakeLists.txt
Version numbering management code has moved to new home, nothing
needs to change here from the bumps to numbering in release-5-0
branch.
Change-Id: I8e45709c83d5c181900cca50b2ccba489630bbe7
No differences found