comparison core/configmanager.lua @ 7191:df4f52cabdfe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 24 Feb 2016 11:20:00 +0100
parents 6236668da30a
children 24170d74b00b
comparison
equal deleted inserted replaced
7188:e8f20be3e6f8 7191:df4f52cabdfe