biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4223f2
b467852
)
Merge release-5-0 into master
author
Roland Schulz
<roland@utk.edu>
Thu, 19 Jun 2014 19:21:55 +0000
(15:21 -0400)
committer
Roland Schulz
<roland@utk.edu>
Thu, 19 Jun 2014 19:21:55 +0000
(15:21 -0400)
Conflicts:
CMakeLists.txt (trivial/backport)
Reverted change to cmake/gmxCFlags.cmake which
shouldn't be merged into master.
Change-Id: I1285fa0b892cbcfc14b53d18b547e396bec5bec3
Trivial merge
biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff