Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Sun, 24 Aug 2014 17:36:51 +0000 (13:36 -0400)
committerRoland Schulz <roland@utk.edu>
Mon, 25 Aug 2014 03:48:57 +0000 (23:48 -0400)
commitf62a0e6795372dba0b6dc851fa736980bfd2195c
tree7eda74406de1947fee79a765e7857fcf5f9b6d35
parentee7638d8e6a8d5e35a8264d120e3434afa8405b8
parent839b4f6ce0f8544c90ca7cf74b35e0ab12fe9596
Merge release-5-0 into master

Conflicts:
install-guide/configure-install-guide.cmake.in
applied to docs/configure-markdown.cmake.in
Moved doxygen/cycle-suppressions.txt -> docs/doxygen/cycle-suppressions.txt
docs/CMakeLists.txt: replaced PROJECT_VERSION with GMX_VERSION_STRING

Change-Id: I61724a10a5331fdf747edd411dfa2f2256cd3f6b
26 files changed:
.gitattributes
CMakeLists.txt
docs/CMakeLists.txt
docs/configure-markdown.cmake.in
docs/doxygen/CMakeLists.txt
docs/doxygen/Doxyfile-common.cmakein
docs/doxygen/Doxyfile-version.cmakein
docs/doxygen/codelayout.md
docs/doxygen/cycle-suppressions.txt
docs/doxygen/directories.cpp
docs/doxygen/doxygen-check.py
docs/doxygen/doxygen.md
docs/doxygen/doxygenxml.py
docs/doxygen/gmxtree.py
docs/doxygen/graphbuilder.py
docs/doxygen/reporter.py
docs/doxygen/suppressions.txt
docs/doxygen/usinglibrary.md
docs/install-guide/install-guide.md
docs/man/CMakeLists.txt
docs/manual/README
docs/manual/macros.tex
docs/manual/monster.bib
docs/old-html/CMakeLists.txt
src/gromacs/CMakeLists.txt
src/gromacs/mdlib/constr.c