biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccd8bc3 5012852)
Merge release-5-0 into master
authorChristoph Junghans <junghans@votca.org>
Wed, 26 Nov 2014 22:18:01 +0000 (15:18 -0700)
committerChristoph Junghans <junghans@votca.org>
Wed, 26 Nov 2014 22:19:45 +0000 (15:19 -0700)
Change-Id: If41f9c458e5d3aa5f841afcd71bc7f72a1f312c7

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

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