comparison main/MainWindow.h @ 879:158d059d9a4c

Merge from branch 2.4-stable
author Chris Cannam
date Wed, 01 Oct 2014 21:45:55 +0100
parents 5b4206f7d7d4
children c62c3e4825ee
comparison
equal deleted inserted replaced
873:260024e62b6b 879:158d059d9a4c