comparison config.pri.in @ 940:2481777d4c3e

Merge from branch tonioni (the two are currently in sync)
author Chris Cannam
date Wed, 18 Jun 2014 18:30:19 +0100
parents c724b148576d
children 79f7af8873c9
comparison
equal deleted inserted replaced
936:0c1d6de8f44b 940:2481777d4c3e