comparison widgets/ColourNameDialog.cpp @ 663:1a0fdad4af4d tonioni

Merge from the default branch
author Chris Cannam
date Fri, 12 Jul 2013 13:25:22 +0100
parents 9dd432665059
children a34a2a25907c
comparison
equal deleted inserted replaced
660:8663a831838f 663:1a0fdad4af4d