Merge branch 'master' of git@git.gromacs.org:gromacs
authorSzilard Pall <pszilard@cbr.su.se>
Thu, 24 Jun 2010 19:23:32 +0000 (21:23 +0200)
committerSzilard Pall <pszilard@cbr.su.se>
Thu, 24 Jun 2010 19:23:32 +0000 (21:23 +0200)
commita62100811b78dc8c39022e3578c072869c4cb16e
treec78a6e0b6b492370502b96b5f85c03d81a017388
parentc5d62af07d01b845293b1b792d32f4e80312a92b
parentf11585e3b1a37341190a36542f3bb0c292d7da54
Merge branch 'master' of git@git.gromacs.org:gromacs
CMakeLists.txt
src/tools/CMakeLists.txt