Merge "Added note about make_edi and flooding in ED paragraph" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Thu, 17 Jan 2013 22:22:10 +0000 (23:22 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 17 Jan 2013 22:22:10 +0000 (23:22 +0100)
commit3cdd961bfd600b816562f176dd8385ea395062e0
treeae908d4e712e37e0c671edce47198be9e20a628b
parent353ddbeeb85f15a367e56a960292d0818a512fc5
parentb933bdb841e750fc61e88fc52b674eb29fdc031c
Merge "Added note about make_edi and flooding in ED paragraph" into release-4-6