Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sat, 18 Jul 2015 07:51:30 +0000 (10:51 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sat, 18 Jul 2015 07:51:30 +0000 (10:51 +0300)
commit76444196bec6eeeae924b61946f5da9e76242c6e
treec7f9f8b3d5b2b563ab86f07dddd0c1c07d38abb6
parent8e461528df6012f1ba0299e3e6e4bd563bf889bb
parent7a6907d2184cf7bf3ce09e83e9d902f9787a3eb0
Merge branch 'master' into pygromacs
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp