comparison main/PreferencesDialog.cpp @ 748:84aad65a6539

Merge subrepos from tonioni branch
author Chris Cannam
date Fri, 18 Jul 2014 15:46:18 +0100
parents c7945dad2f49
children fbd2534d17f8
comparison
equal deleted inserted replaced
747:eb494fb9d2df 748:84aad65a6539