annotate images/cancel-small.png @ 666:98a7fbbe9d88 qt5

Merge from default branch, and build fixes
author Chris Cannam
date Fri, 27 May 2016 09:55:56 +0100
parents 1ff2a1bf0a40
children
rev   line source
Chris@561 1 (binary:image/png)