Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-06-05 03:02:50 -03:00
68 changed files with 1439 additions and 524 deletions
+1 -1
View File
@@ -123,7 +123,7 @@ extern "C" int luaopen_love_event(lua_State *L)
{
if (instance == 0)
{
EXCEPT_GUARD(instance = new Event();)
luax_catchexcept(L, [&](){ instance = new Event(); });
}
else
instance->retain();