Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 10 Jul 2015 16:38:05 +0000 (19:38 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 10 Jul 2015 16:38:05 +0000 (19:38 +0300)
commit6b856a036ba1435556b070c7583fcce4870ff9e7
tree24027a25a7c9939bbdebe0efd8c18086b30a202f
parentec3b90e4e671d54c80e403904bda2ca3688fdbe9
parentb675b1755ba6deaa1daa0b73351e84164bee71bb
Merge branch 'master' into pygromacs
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp