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 /COPYING | |
| 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 'COPYING')
0 files changed, 0 insertions, 0 deletions