aboutsummaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorPhilipp Janda <siffiejoe@gmx.net>2013-10-13 19:29:01 +0200
committerPhilipp Janda <siffiejoe@gmx.net>2013-10-13 19:29:01 +0200
commit309ad25d1ac13584e8c7656833bb632c5e179036 (patch)
treeb28da9f7008b1cb31a2cd8a5b8c0abb518c7cecb /src/bin
parente6e0e57a4c36f2d93fa674292658e701d1a4640f (diff)
parent57bde51526bcd9c022e29802f29ae432a3a03bef (diff)
downloadluarocks-309ad25d1ac13584e8c7656833bb632c5e179036.tar.gz
luarocks-309ad25d1ac13584e8c7656833bb632c5e179036.tar.bz2
luarocks-309ad25d1ac13584e8c7656833bb632c5e179036.zip
Merge remote-tracking branch 'upstream/master' into linux-multiarch
Diffstat (limited to 'src/bin')
-rwxr-xr-xsrc/bin/luarocks1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bin/luarocks b/src/bin/luarocks
index b64051d4..e28b17b8 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -19,6 +19,7 @@ commands.path = require("luarocks.path")
19commands.show = require("luarocks.show") 19commands.show = require("luarocks.show")
20commands.new_version = require("luarocks.new_version") 20commands.new_version = require("luarocks.new_version")
21commands.lint = require("luarocks.lint") 21commands.lint = require("luarocks.lint")
22commands.write_rockspec = require("luarocks.write_rockspec")
22commands.purge = require("luarocks.purge") 23commands.purge = require("luarocks.purge")
23 24
24command_line.run_command(...) 25command_line.run_command(...)