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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:36:34 +02:00
parent b28f1676c6 1736a5fca8
commit cd18fa9ca0
37 changed files with 122 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/lua/lua_threads_copy.cpp
View File

@@ -119,6 +119,7 @@ int CLLThread::llthread_copy_value(llthread_copy_state *state, int depth, int id
lua_pushcfunction(state->to_L, fn);
break;
}
/* else fall through */
case LUA_TUSERDATA:
case LUA_TTHREAD:
default: