Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 26 Jul 2015 09:00:05 +0000 (12:00 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 26 Jul 2015 09:00:05 +0000 (12:00 +0300)
commit14cef496793d46312fff5d313d84c1516e821dbb
tree94e4c3340848c5bad80fbbd1dd2fe79f69c008af
parent5a1c6c2d2947f53332b02ca7cbe01dced80b6376
parent86f86f19d985cd5516b5f8bd5d3dab4760d4b573
Merge branch 'master' into pygromacs

Change-Id: I3cbb006177c6117e4310ad182d15bdbc3aa6ed79
src/gromacs/trajectoryanalysis/analysismodule.h
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp
src/gromacs/trajectoryanalysis/runnercommon.cpp