diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-07-01 23:14:34 +0200 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2015-07-01 23:14:34 +0200 |
| commit | 6ca144cee96ef45d6a203455b236e4077dd37a03 (patch) | |
| tree | 54b21f2b46291f64dfca4c9ae36928819053a693 /COPYING | |
| parent | 642be5cee59a20654226466f6f865e230c326751 (diff) | |
| parent | 634ff0af63a250859863cee25b8ab21e2404a267 (diff) | |
| download | luarocks-6ca144cee96ef45d6a203455b236e4077dd37a03.tar.gz luarocks-6ca144cee96ef45d6a203455b236e4077dd37a03.tar.bz2 luarocks-6ca144cee96ef45d6a203455b236e4077dd37a03.zip | |
Merge branch 'master' of github.com:keplerproject/luarocks into pref_versioned
Conflicts:
src/luarocks/cfg.lua
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions