diff layer/ColourDatabase.h @ 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 e1a9e478b7f2
children 05d614f6e46d
line wrap: on
line diff