Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-02-02 01:13:21 -04:00
35 changed files with 6573 additions and 7744 deletions
@@ -66,6 +66,7 @@ int w_setColor(lua_State *L);
int w_getColor(lua_State *L);
int w_setBackgroundColor(lua_State *L);
int w_getBackgroundColor(lua_State *L);
int w_setNewFont(lua_State *L);
int w_setFont(lua_State *L);
int w_getFont(lua_State *L);
int w_setColorMask(lua_State *L);