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

Origin commit data
------------------
Commit: 23a49ad0fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)
This commit is contained in:
vanhofen
2016-09-06 01:13:44 +02:00
2 changed files with 2 additions and 1 deletions

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 56 #define LUA_API_VERSION_MINOR 57

View File

@@ -151,6 +151,7 @@ static void set_lua_variables(lua_State *L)
{ "prog3", CRCInput::RC_prog3 }, { "prog3", CRCInput::RC_prog3 },
{ "prog4", CRCInput::RC_prog4 }, { "prog4", CRCInput::RC_prog4 },
#endif #endif
{ "timeout", (lua_Integer)CRCInput::RC_timeout },
/* to check if it is in our range */ /* to check if it is in our range */
{ "MaxRC", CRCInput::RC_MaxRC }, { "MaxRC", CRCInput::RC_MaxRC },
{ NULL, 0 } { NULL, 0 }