comparison src/MainWindow.h @ 512:0ab091a4538f

Merge from branch "2.0-integration"
author Chris Cannam
date Mon, 19 Oct 2015 14:18:15 +0100
parents 5865c6e296c5
children 30fbc53d8150
comparison
equal deleted inserted replaced
510:a3d73feeb850 512:0ab091a4538f