Merge "Remove double declaration in headers" into release-4-6
authorRoland Schulz <roland@utk.edu>
Mon, 19 Nov 2012 14:32:40 +0000 (15:32 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 19 Nov 2012 14:32:40 +0000 (15:32 +0100)
commit3cd6352667114cb6520cd9360c1a6454d78a1294
treef20d705444c5c5bca1e884e885061b55d735a28d
parent3ef3945ab9f268f5b011552a9cc5d2feba7517c2
parent4af402efd68710ed27fb58a7d2561961d034728f
Merge "Remove double declaration in headers" into release-4-6