Merge branch 'master' into api-fix

This commit is contained in:
ThePhD 2014-12-17 16:24:53 -05:00
commit 8a4595dc80
2 changed files with 4 additions and 1 deletions

3
.gitignore vendored
View File

@ -30,3 +30,6 @@ build.ninja
main.ninja
*.user
*.3cb9f6a
luajit-2.0.3/
.dropbox*
desktop.ini

View File

@ -259,7 +259,7 @@ struct base_function {
}
template <std::size_t limit>
static void func_gc (std::true_type, lua_State* L) {
static void func_gc (std::true_type, lua_State*) {
}