diff framework/MainWindowBase.cpp @ 376:98afba87887f

Merge from branch tonioni (the two are currently in sync)
author Chris Cannam
date Wed, 18 Jun 2014 18:30:50 +0100
parents f1cab64363d7
children 024226dd9f51
line wrap: on
line diff