Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
authorErik Lindahl <lindahl@cbr.su.se>
Tue, 31 Aug 2010 18:10:10 +0000 (20:10 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Tue, 31 Aug 2010 18:10:10 +0000 (20:10 +0200)
commit8570cb38ae27351f681de5fd80f008d6f89962df
tree83f87436390e5320df72befbea57ea6a5a24970d
parentbbc612e5bfb4366d13249bce30f009e24e6a7423
parent9a3d7410e66f7656c7e50120bf31edc036aef9d4
Merge branch 'release-4-5-patches' of git.gromacs.org:gromacs into release-4-5-patches
CMakeLists.txt
src/gmxlib/CMakeLists.txt