Merge branch 'master' into 12.0-development

This commit is contained in:
Alex Szpakowski
2020-09-21 22:35:19 -03:00
8 changed files with 21 additions and 13 deletions
+1 -1
View File
@@ -709,7 +709,7 @@ int luax_catchexcept(lua_State *L, const T& func, const F& finallyfunc)
* Compatibility shim for lua_resume
* Exported because it's used in the launcher
**/
LOVE_EXPORT int luax_resume(lua_State *L, int nargs);
LOVE_EXPORT int luax_resume(lua_State *L, int nargs, int* nres);
} // love