biod.pnpi.spb.ru / alexxy / gromacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f42a9e9 fc8a562)
Merge release-4-6 into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 5 May 2015 22:07:51 +0000 (00:07 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 5 May 2015 22:10:31 +0000 (00:10 +0200)
commit6b32c7f42c6c13274d90b53dbaa514af98e7696d
tree6ee8d5e15b74744cf27965ebe22152f0fb8f8ebatree | snapshot
parentf42a9e9a3ea32a359418957b43a612fc5bd8187dcommit | diff
parentfc8a5624e96769cbe95da6159398f56bd297b38ecommit | diff
Merge release-4-6 into release-5-0

Conflicts:
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu

Only conflict was from changes to a comment (end-of-line space removed
already in release-5-0, fix on next line in release-4-6). Resolved in
favour of recent fix on release-4-6, and uncrustify re-removed the
space.

Change-Id: Iffed0bc8b9a8c52a96ffe8a9a5baf8f5696f8cf7
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda.cu diff1 | | blob | history
src/gromacs/mdlib/sim_util.c diff1 | | blob | history
Local GROMACS mirror with custom stuff