mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Commit: 4b774c66ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-08 (Thu, 08 Sep 2016)
This commit is contained in:
vanhofen
2016-09-08 19:14:03 +02:00
parent c5ffe722e8 48f698f372
commit 4632f0b5d0
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes * to luainstance.h changes
*/ */
#define LUA_API_VERSION_MAJOR 1 #define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 58 #define LUA_API_VERSION_MINOR 59

3
src/gui/lua/lua_misc.cpp
View File

@@ -383,8 +383,7 @@ int CLuaInstMisc::MiscDelete(lua_State *L)
deprecated functions deprecated functions
--------------------------------------------------------------- */ --------------------------------------------------------------- */
//#define MISC_FUNC_DEPRECATED miscFunctionDeprecated #define MISC_FUNC_DEPRECATED miscFunctionDeprecated
#define MISC_FUNC_DEPRECATED(...)
void CLuaInstMisc::miscFunctionDeprecated(lua_State *L, std::string oldFunc) void CLuaInstMisc::miscFunctionDeprecated(lua_State *L, std::string oldFunc)
{ {

3
src/gui/lua/lua_video.cpp
View File

@@ -352,8 +352,7 @@ int CLuaInstVideo::VideoDelete(lua_State *L)
deprecated functions deprecated functions
--------------------------------------------------------------- */ --------------------------------------------------------------- */
//#define VIDEO_FUNC_DEPRECATED videoFunctionDeprecated #define VIDEO_FUNC_DEPRECATED videoFunctionDeprecated
#define VIDEO_FUNC_DEPRECATED(...)
void CLuaInstVideo::videoFunctionDeprecated(lua_State *L, std::string oldFunc) void CLuaInstVideo::videoFunctionDeprecated(lua_State *L, std::string oldFunc)
{ {