Merge branch 'master' of git@git.gromacs.org:gromacs
commit4384eb63fda2881b49d78f03c41b98622c289844
authorDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Sun, 16 May 2010 07:10:59 +0000 (16 09:10 +0200)
committerDavid van der Spoel <spoel@anfinsen.bmc.uu.se>
Sun, 16 May 2010 07:10:59 +0000 (16 09:10 +0200)
tree9e3c31e361b47e92fff945ed6737f09a02dc1c32
parent5f9373cfbe487ca0a26d269fe2456fe0cda35691
parent85bebf94b56845c1d8c60f2c19a7861d54d710a9
Merge branch 'master' of git@git.gromacs.org:gromacs
src/kernel/pdb2gmx.c
src/kernel/pdb2top.c