Merge 'default' into 'minor'

--HG--
branch : minor
This commit is contained in:
Bart van Strien
2011-01-17 11:08:58 +01:00
267 changed files with 3612 additions and 3674 deletions
+8 -8
View File
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
* Copyright (c) 2006-2011 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
@@ -168,13 +168,13 @@ namespace sdl
instance->retain();
WrappedModule w;
w.module = instance;
w.name = "joystick";
w.flags = MODULE_T;
w.functions = functions;
w.types = 0;
WrappedModule w;
w.module = instance;
w.name = "joystick";
w.flags = MODULE_T;
w.functions = functions;
w.types = 0;
return luax_register_module(L, w);
}