Conflicts: doc/html/searchindex.js doc/html/setup-dks.html src/classes/PMusrCanvas.cpp src/include/PMusrCanvas.h src/musrview.cpp