frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into merge_v4l2

Browse Source 
Former-commit-id: 015ff84842dc7a90ff603234ed2bb2a6afd27ab2
This commit is contained in:
johan
2014-03-01 19:47:24 +01:00
parent 99fd50805c 2a083f0293
commit 69c64c379a
9 changed files with 115 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/effectengine/EffectEngine.h
View File

@@ -55,5 +55,5 @@ private:
std::list<Effect *> _activeEffects;
PyThreadState * _mainThreadState;
PyThreadState * _mainThreadState;
};