comparison main/PreferencesDialog.h @ 434:db0c86c4e5e9 templating

Merge from the default branch
author Chris Cannam
date Tue, 17 May 2011 13:33:15 +0100
parents a3b2cba73143
children 6d827453657f f8f74f1b5b4f
comparison
equal deleted inserted replaced
431:ee927c1b7941 434:db0c86c4e5e9