comparison main/PreferencesDialog.h @ 1082:b2c45b831ea8 3.0-integration

Merge from default branch
author Chris Cannam
date Wed, 18 Nov 2015 12:08:33 +0000
parents c9d87032f3da
children 11ef2f95ea15
comparison
equal deleted inserted replaced
1071:b0f6dce4eab0 1082:b2c45b831ea8