Diff

core/configmanager.lua @ 7088:85e72077d40b

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 20 Jan 2016 14:46:27 +0100
parent 6779:6236668da30a
child 7947:24170d74b00b
line wrap: on
line diff