Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 24 Jul 2015 06:40:20 +0000 (09:40 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 24 Jul 2015 06:40:20 +0000 (09:40 +0300)
commita9f409c8d07c336c774349af23b598c56fe09712
tree99610bec21b1dc70bdda939cc9ed8b8ae4a2efad
parent431623ab5cb2ff34e7052b4bba0d84550a295c6a
parent64a6716f5a93af9cd89db4e62142a871a95a27b7
Merge branch 'master' into pygromacs
src/gromacs/trajectoryanalysis/runnercommon.cpp