Merge branch release-2016

author Mark Abraham <mark.j.abraham@gmail.com>

Tue, 20 Dec 2016 12:03:37 +0000 (23:03 +1100)

committer Mark Abraham <mark.j.abraham@gmail.com>

Tue, 20 Dec 2016 12:04:29 +0000 (23:04 +1100)
author Mark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Dec 2016 12:03:37 +0000 (23:03 +1100)
committer Mark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Dec 2016 12:04:29 +0000 (23:04 +1100)
diff --cc CMakeLists.txt
Simple merge
diff --cc docs/doxygen/includesorter.py
Simple merge
diff --cc src/gromacs/gmxana/gmx_wham.cpp
Simple merge
diff --cc src/programs/mdrun/membed.cpp
Simple merge
author	Mark Abraham <mark.j.abraham@gmail.com>
	Tue, 20 Dec 2016 12:03:37 +0000 (23:03 +1100)
committer	Mark Abraham <mark.j.abraham@gmail.com>
	Tue, 20 Dec 2016 12:04:29 +0000 (23:04 +1100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
docs/doxygen/includesorter.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/gromacs/gmxana/gmx_wham.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/programs/mdrun/membed.cpp	patch \|	diff1 \|	diff2 \|	blob \| history