comparison base/Preferences.h @ 808:67003fb58ba4

Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:05 +0100
parents 75f154085a4d
children 2c4aca969c24 451f7f3ab6e7
comparison
equal deleted inserted replaced
798:fea591a66e5d 808:67003fb58ba4