biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ee508a 136b27a)
Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
authorRoland Schulz <roland@utk.edu>
Wed, 8 Feb 2012 00:14:57 +0000 (19:14 -0500)
committerRoland Schulz <roland@utk.edu>
Wed, 8 Feb 2012 00:16:10 +0000 (19:16 -0500)
Change-Id: I13898484048384500e946fc4dddaaca3281a8819

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history
src/gmxlib/CMakeLists.txt patch | diff1 | diff2 | blob | history

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