Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

This commit is contained in:
Florian Nücke 2014-03-30 23:30:23 +02:00
commit ac71317340
2 changed files with 2 additions and 2 deletions

View File

@ -37,7 +37,7 @@ for i = 1, #dirs do
end end
table.sort(lsd) table.sort(lsd)
table.sort(lsf) table.sort(lsf)
setColor(0x99CCFF) setColor(0x66CCFF)
for _, d in ipairs(lsd) do for _, d in ipairs(lsd) do
if options.a or d:sub(1, 1) ~= "." then if options.a or d:sub(1, 1) ~= "." then
io.write(d .. "\t") io.write(d .. "\t")

View File

@ -14,7 +14,7 @@ local function findFile(name, ext)
dir = shell.resolve(dir) dir = shell.resolve(dir)
end end
dir = fs.concat(fs.concat(dir, name), "..") dir = fs.concat(fs.concat(dir, name), "..")
name = fs.name(name) local name = fs.name(name)
local list = fs.list(dir) local list = fs.list(dir)
if list then if list then
local files = {} local files = {}