comparison core/configmanager.lua @ 7282:29eedc776bbd

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 14 Mar 2016 18:27:32 +0100
parents 6236668da30a
children 24170d74b00b
comparison
equal deleted inserted replaced
7280:8b5a9208c212 7282:29eedc776bbd