biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
28bb38b
)
Merge branch release-4-6 into release-5-0
author
Mark Abraham
<mark.j.abraham@gmail.com>
Thu, 18 Sep 2014 09:53:17 +0000
(11:53 +0200)
committer
Mark Abraham
<mark.j.abraham@gmail.com>
Thu, 18 Sep 2014 09:53:17 +0000
(11:53 +0200)
Conflicts:
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
Change in release-4-6 was in a function already removed in
release-5-0, so omitted.
Change-Id: I58f745308357211d517ffdb58381ce5fb1a5dceb
No differences found
biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff