comparison widgets/ColourNameDialog.h @ 804:5c4a405a70fc tony_integration

Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:55:18 +0100
parents 9dd432665059
children a34a2a25907c
comparison
equal deleted inserted replaced
803:5d2966b7c201 804:5c4a405a70fc