biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78dd0f0 8e623f5)
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Sun, 27 Nov 2011 21:52:42 +0000 (16:52 -0500)
committerRoland Schulz <roland@utk.edu>
Sun, 27 Nov 2011 21:54:16 +0000 (16:54 -0500)
Change-Id: I9f12fee0e49e1f7d758a2080337269753f31f3bf

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
src/mdlib/domdec.c patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge
diff --cc src/mdlib/domdec.c
Simple merge
Local GROMACS mirror with custom stuff