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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 429d510ef1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-08 16:23:25 +02:00
parent fed7126cbc 11b4748125
commit d766040099
5 changed files with 101 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/movieplayer.cpp
View File

@@ -27,7 +27,10 @@
#include <config.h>
#endif
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
#include <stdint.h>
#include <global.h>
#include <neutrino.h>