Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 11 Jul 2016 15:36:33 +0000 (17:36 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Jul 2016 16:29:50 +0000 (18:29 +0200)
commit39fd1db3f9605a29a0bed6e2ad0e41017b190de6
tree3e854ac026d4742057412189985ecdc6b84da93a
parent977dfba1ea6e5ae500c1eb3e1cfbbdf14ca39cce
parent98d6c26b13470698d89c6904e1643b628ce54eea
Merge branch release-2016

Many conflicts from modified warnings and the introduction of
the new logging module, but straightforward to resolve by
using the new infrastructure to deliver the old message.

Change-Id: I15bdee3aa6dd19d55ff46b737e0abd3f76153494
16 files changed:
cmake/gmxVersionInfo.cmake
docs/doxygen/includesorter.py
src/gromacs/gmxpreprocess/grompp.cpp
src/gromacs/gpu_utils/gpu_utils.cu
src/gromacs/gpu_utils/gpu_utils_ocl.cpp
src/gromacs/hardware/detecthardware.cpp
src/gromacs/hardware/detecthardware.h
src/gromacs/hardware/hardwaretopology.cpp
src/gromacs/hardware/hardwaretopology.h
src/gromacs/mdlib/integrator.h
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdlib/md_support.h
src/gromacs/mdlib/minimize.cpp
src/gromacs/mdlib/tpi.cpp
src/programs/mdrun/md.cpp
src/programs/mdrun/runner.cpp