comparison widgets/ColourNameDialog.cpp @ 827:ea098f7565eb

Merge from branch tonioni
author Chris Cannam
date Fri, 18 Jul 2014 15:38:21 +0100
parents 9dd432665059
children a34a2a25907c
comparison
equal deleted inserted replaced
823:2d4af227fd32 827:ea098f7565eb