comparison main/PreferencesDialog.h @ 1071:b0f6dce4eab0 3.0-integration

Merge from default branch
author Chris Cannam
date Tue, 20 Oct 2015 09:14:24 +0100
parents c9d87032f3da
children 11ef2f95ea15
comparison
equal deleted inserted replaced
1069:eb51a6fac387 1071:b0f6dce4eab0