comparison widgets/ColourNameDialog.cpp @ 813:f82dece35d21

Merge from branch tonioni (the two are currently in sync)
author Chris Cannam
date Wed, 18 Jun 2014 18:30:48 +0100
parents 9dd432665059
children a34a2a25907c
comparison
equal deleted inserted replaced
811:c4ef666721bf 813:f82dece35d21