Comparison

core/storagemanager.lua @ 6557:8aa967c81cbc

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 21 Jan 2015 01:29:00 +0000
parent 6336:11510d4d3b57
parent 6552:bcb834728ee5
child 6666:42fdc8dddf04
comparison
equal deleted inserted replaced
6543:01cd51777abb 6557:8aa967c81cbc
1 1
2 local error, type, pairs = error, type, pairs; 2 local type, pairs = type, pairs;
3 local setmetatable = setmetatable; 3 local setmetatable = setmetatable;
4 4
5 local config = require "core.configmanager"; 5 local config = require "core.configmanager";
6 local datamanager = require "util.datamanager"; 6 local datamanager = require "util.datamanager";
7 local modulemanager = require "core.modulemanager"; 7 local modulemanager = require "core.modulemanager";