Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Sat, 25 Sep 2010 13:17:07 +0000 (15:17 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Sat, 25 Sep 2010 13:17:07 +0000 (15:17 +0200)
commitbb8ce998a5283f9e120ef71476a9f685ee9c47d6
treea8ecef4f3945e88befb9fc974afa83163bee91dd
parent701ccf3b9c2e7277bfc094eac4fc6b37be938625
parent1cc36f355a0ba852fe3ad7d08376c0006af700ce
Merge branch 'release-4-5-patches'

Conflicts:

share/top/gurgle.dat
share/top/gurgle.dat
src/kernel/CMakeLists.txt
src/kernel/md_openmm.c