Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 24 Jul 2015 14:40:41 +0000 (16:40 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 24 Jul 2015 14:40:41 +0000 (16:40 +0200)
commit5750bfe806310856448a1e7baf46a7d648d1185e
treec663f1cc0cee73a73b5c5ac113a7d746f25dc664
parent3dadfbb969e79953a942885fb931908a36fcaf08
parent61ba45d5a1865eace484126b5beeb2ea286fc6d7
Merge branch release-5-1

Conflicts:
src/gromacs/commandline/shellcompletions.cpp
Removed line no longer appropriate, now that zsh completion
is supported. Master had changed the previous line, which
git flags as a merge conflict.

Change-Id: Id9d37615b2bd121b1206ca0e6e8eac62fcf38f01
src/gromacs/commandline/shellcompletions.cpp
src/gromacs/gmxpreprocess/grompp.cpp
src/gromacs/options/filenameoptionmanager.cpp
src/gromacs/trajectoryanalysis/modules/sasa.cpp