Merge branch release-2018 into release-2019
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Oct 2018 13:47:06 +0000 (15:47 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 26 Oct 2018 14:07:00 +0000 (16:07 +0200)
commitfb755982116311bee2d1f9770678d221112e1ddb
tree3e7220256128b1a27938a8af52e45322c15c323c
parent53ea5a030e306ff390b062b5f268dee537aa6f34
parentb51dbae2a81a1f719c96442f7120ff0807fa1e49
Merge branch release-2018 into release-2019

Restored some text about gmx_enerdata_t fields that got list when
master branch moved some content from forcerec.h into the new
enerdata.h.

Change-Id: I45b956e02d6713190fca456ad0a5948db5001737
docs/CMakeLists.txt
docs/user-guide/index.rst
docs/user-guide/mdp-options.rst
src/gromacs/ewald/pme.cpp
src/gromacs/fileio/tpxio.cpp
src/gromacs/fileio/tpxio.h
src/gromacs/gmxana/gmx_helix.cpp
src/gromacs/gmxana/gmx_mindist.cpp
src/gromacs/mdlib/force.cpp
src/gromacs/mdlib/membed.cpp
src/gromacs/mdtypes/enerdata.h