Merge branch release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Dec 2016 12:03:37 +0000 (23:03 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Dec 2016 12:04:29 +0000 (23:04 +1100)
commitb7b8ceced5384d42b9dcb4f1faa1ac77e4713f58
tree3770d5b84525a554dbc6aa71a73b0148572d9c04
parent4a33c592de2653bde5a593e2381e48ced9678674
parent546e12d993fe477baffa933fb387917e0def9a16
Merge branch release-2016

No conflicts

Change-Id: I175809e0b4f6ebf7dbbe668de66c47c318954b55
CMakeLists.txt
docs/doxygen/includesorter.py
src/gromacs/gmxana/gmx_wham.cpp
src/programs/mdrun/membed.cpp