biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30e4607 c7b621b)
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Mon, 26 Dec 2011 14:06:22 +0000 (09:06 -0500)
committerRoland Schulz <roland@utk.edu>
Mon, 26 Dec 2011 14:06:22 +0000 (09:06 -0500)
Conflicts:
src/tools/gmx_tune_pme.c

Change-Id: I0cb93d965cd30a6d0e158eac595fac7c8b891492

1  2 
src/tools/gmx_tune_pme.c patch | diff1 | diff2 | blob | history

diff --cc src/tools/gmx_tune_pme.c
Simple merge
Local GROMACS mirror with custom stuff