diff layer/ColourMapper.cpp @ 640:c6d705bf1672

Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:43 +0100
parents aca01b3af29f
children 1a0dfcbffaf1
line wrap: on
line diff