Merge "Added support for dssp2.X with the -ver option" into release-4-6
authorDavid van der Spoel <davidvanderspoel@gmail.com>
Mon, 16 Apr 2012 19:21:05 +0000 (21:21 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 16 Apr 2012 19:21:05 +0000 (21:21 +0200)

Trivial merge