mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 01:43:35 +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/epgview.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a29d0613ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-20 14:34:45 +01:00
parent 6c42ccd0bc cb3b233e6c
commit eb010cdbd1
12 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/record.h
View File

@@ -30,7 +30,7 @@
#include <timerdclient/timerdtypes.h>
#include <neutrinoMessages.h>
#include <gui/movieinfo.h>
#include <driver/movieinfo.h>
#if HAVE_COOL_HARDWARE
#include <record_cs.h>