diff options
| author | mpeterv <petjamelnik@yandex.ru> | 2014-03-21 11:56:31 +0400 |
|---|---|---|
| committer | mpeterv <petjamelnik@yandex.ru> | 2014-03-21 11:56:31 +0400 |
| commit | 8498916df098bfcf17947537427cc1fffdeea2a5 (patch) | |
| tree | 841974f23a6300ce138f20faef31ea67ed41d98b /src/bin | |
| parent | d9c799153ebf5645cf7d7a8fe473c5aff32ec4d3 (diff) | |
| parent | 397659cc5cb30569b33cc9c0ab220f85379bc97f (diff) | |
| download | luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.tar.gz luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.tar.bz2 luarocks-8498916df098bfcf17947537427cc1fffdeea2a5.zip | |
Merge branch 'master' of https://github.com/keplerproject/luarocks into lua52_compat
Conflicts:
src/bin/luarocks
src/luarocks/fs/unix/tools.lua
src/luarocks/path.lua
Fixed:
src/luarocks/path_cmd.lua: moved meta-data from path.lua
Makefile: added path_cmd.lua to the list of installed files
Diffstat (limited to 'src/bin')
| -rwxr-xr-x | src/bin/luarocks | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/luarocks b/src/bin/luarocks index 9c190175..b85fbc7c 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks | |||
| @@ -16,7 +16,7 @@ commands = { | |||
| 16 | remove = "luarocks.remove", | 16 | remove = "luarocks.remove", |
| 17 | make = "luarocks.make", | 17 | make = "luarocks.make", |
| 18 | download = "luarocks.download", | 18 | download = "luarocks.download", |
| 19 | path = "luarocks.path_command", | 19 | path = "luarocks.path_cmd", |
| 20 | show = "luarocks.show", | 20 | show = "luarocks.show", |
| 21 | new_version = "luarocks.new_version", | 21 | new_version = "luarocks.new_version", |
| 22 | lint = "luarocks.lint", | 22 | lint = "luarocks.lint", |