comparison src/settingsdialog.cpp @ 422:2af4b5b0bf83

Merge from branch "ignore"
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Wed, 22 Jun 2011 13:01:50 +0100
parents c567fed39559
children b57d50114d8d
comparison
equal deleted inserted replaced
412:498c2ca0b367 422:2af4b5b0bf83