Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 6 Feb 2016 01:54:15 +0000 (01:54 +0000)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 6 Feb 2016 02:00:27 +0000 (02:00 +0000)
commit2d4cfab660160f3de2c3c32bb51896883d5d7e8c
tree989ce0c8a004e6d11117cd5e676e7e25b5d6fef7
parent971335dcc39f11cc2e989bdfaf42af446de47a2d
parent987b8d25c004e36369f451bd3dba97fe26be1f8f
Merge branch release-5-1

Moved new test/readinp.cpp file to fileio where readinp.cpp is
now located. Left skeleton test infrastructure in place but
deactivated until needed again.

Change-Id: I9261aba261314170634322018b4315d2ebe35601
16 files changed:
cmake/gmxVersionInfo.cmake
src/gromacs/ewald/pme.cpp
src/gromacs/fileio/readinp.cpp
src/gromacs/fileio/tests/CMakeLists.txt
src/gromacs/fileio/tests/readinp.cpp
src/gromacs/fileio/warninp.cpp
src/gromacs/fileio/warninp.h
src/gromacs/gmxlib/CMakeLists.txt
src/gromacs/gmxlib/tests/CMakeLists.txt
src/gromacs/gmxpreprocess/toppush.cpp
src/gromacs/mdlib/calc_verletbuf.cpp
src/gromacs/mdlib/clincs.cpp
src/gromacs/mdlib/constr.cpp
src/gromacs/mdlib/nbnxn_search.cpp
src/gromacs/mdlib/stat.cpp
src/programs/mdrun/runner.cpp