comparison widgets/ColourNameDialog.h @ 1041:fcedcc7f0d87 3.0-integration

Merge from branch "tony-2.0-integration"
author Chris Cannam
date Thu, 04 Feb 2016 11:17:23 +0000
parents 9dd432665059
children a34a2a25907c
comparison
equal deleted inserted replaced
1011:7242fe160c19 1041:fcedcc7f0d87