comparison main/MainWindow.cpp @ 1082:b2c45b831ea8 3.0-integration

Merge from default branch
author Chris Cannam
date Wed, 18 Nov 2015 12:08:33 +0000
parents 1f92fc7a6b05
children 6fcb632384ba
comparison
equal deleted inserted replaced
1071:b0f6dce4eab0 1082:b2c45b831ea8