Diff

core/configmanager.lua @ 7441:df1be36f87b1

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 25 May 2016 21:35:09 +0200
parent 6779:6236668da30a
child 7947:24170d74b00b
line wrap: on
line diff