Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 19 Jul 2015 08:31:37 +0000 (11:31 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 19 Jul 2015 08:31:37 +0000 (11:31 +0300)
commit48c9a4855bde90a698842d4788168cb71744270c
treee61035ae42e025007df6db3b664c5dfbad2c5aee
parente8cc66fa809c181bca1bb2539691edab83f5fff0
parent8a2526894f17be3f183282c22d9c20d32a959630
Merge branch 'master' into pygromacs
src/gromacs/trajectoryanalysis/cmdlinerunner.cpp