aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2012-10-02 20:26:21 -0300
committerHisham Muhammad <hisham@gobolinux.org>2012-10-02 20:26:21 -0300
commit481fb40c6b505af45a67c0f9d158284c504b72e4 (patch)
tree589f1164e77a02736ec5afbd246bc7ec2968bb3e /src
parent481fb3bb2e741957ccfcd68e569d83e7cf8bd5b7 (diff)
parentef5944ef0cf6cdb04d6333020666ff8cbd7fa7fb (diff)
downloadluarocks-481fb40c6b505af45a67c0f9d158284c504b72e4.tar.gz
luarocks-481fb40c6b505af45a67c0f9d158284c504b72e4.tar.bz2
luarocks-481fb40c6b505af45a67c0f9d158284c504b72e4.zip
Merge branch 'master' into multitree
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/cfg.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index a05c6d51..acf35793 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -181,6 +181,7 @@ local defaults = {
181 "http://luarocks.giga.puc-rio.br/", 181 "http://luarocks.giga.puc-rio.br/",
182 "http://luafr.org/luarocks/rocks", 182 "http://luafr.org/luarocks/rocks",
183 "http://liblua.so/luarocks/repositories/rocks", 183 "http://liblua.so/luarocks/repositories/rocks",
184 "http://luarocks.logiceditor.com/rocks",
184 } 185 }
185 }, 186 },
186 187