diff options
author | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-11 04:47:08 +0000 |
---|---|---|
committer | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-11 04:47:08 +0000 |
commit | 01a0723c9dd08b86ac96b09c08b9ce16cafa2438 (patch) | |
tree | fae83a35c1c69b1f9aeb0ef31e54175d249bd320 /test | |
parent | 311287db133962862f03f01c02bb6debee429e3c (diff) | |
download | luarocks-01a0723c9dd08b86ac96b09c08b9ce16cafa2438.tar.gz luarocks-01a0723c9dd08b86ac96b09c08b9ce16cafa2438.tar.bz2 luarocks-01a0723c9dd08b86ac96b09c08b9ce16cafa2438.zip |
Fix conflict resolution scheme using proper Lua 5.1 mechanism
git-svn-id: http://luarocks.org/svn/luarocks/trunk@76 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions