comparison main/PreferencesDialog.cpp @ 1139:38b09e4a2121 3.0-integration

Merge from default branch in subrepos
author Chris Cannam
date Fri, 04 Mar 2016 12:39:45 +0000
parents bd3cb9d6db66
children 5e6e1e074080 5a1a3538ff4e
comparison
equal deleted inserted replaced
1137:cf492ec2763c 1139:38b09e4a2121