Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 8 Jan 2016 01:35:59 +0000 (02:35 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 8 Jan 2016 01:42:17 +0000 (02:42 +0100)
commit4160022f829c7e9cc546181bddab619244659329
tree170fa950d587d1f5e922781f016b5391916f21b0
parent67ed55c616dcabd5f4ed9e0fbe3f78ba88563e11
parent330a3cf94e7455e8ea027d2ec682319ea84e1493
Merge branch release-5-1

Ported the change from enum_name returning UNDEFINED to "no name
defined" to the new implementation.

Change-Id: I39ded9be8a49d3ff7de7c5e7c9d05eefbd385727
docs/manual/forcefield.tex
docs/manual/monster.bib
src/gromacs/mdtypes/md_enums.cpp
src/gromacs/mdtypes/md_enums.h
src/gromacs/tools/compare.cpp