diff options
| author | Peter Drahos <drahosp@gmail.com> | 2011-03-15 22:21:42 +0100 |
|---|---|---|
| committer | Peter Drahos <drahosp@gmail.com> | 2011-03-15 22:21:42 +0100 |
| commit | a5a4aabe53db90c8f1b9cc7c19b82295fbec1fe7 (patch) | |
| tree | 40a45fe1cd703aaedba341d17f7f02cdbcc6555d | |
| parent | 55af5c562cda6b3191f48f73ee2bd6d2aad85ea1 (diff) | |
| parent | c47e5db6ca882c8b6f1375d262f902f40403ed20 (diff) | |
| download | lua-a5a4aabe53db90c8f1b9cc7c19b82295fbec1fe7.tar.gz | |
Merge branch 'master' into lua-5.1.4-1
Conflicts:
CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7f34c1..32d49ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,5 +157,3 @@ add_lua_test ( test/sort.lua ) add_lua_test ( test/trace-calls.lua ) add_lua_test ( test/trace-globals.lua ) #add_lua_test ( test/xd.lua ) # Requires input - - |