mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Merge branch 'uncool/dvbsi++'
Conflicts:
src/driver/Makefile.am
src/driver/streamts.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/infoviewer_bb.cpp
src/gui/widget/textbox.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
in __USE_FILE_OFFSET64 mode */
|
||||
|
||||
#ifndef __USE_FILE_OFFSET64
|
||||
#error not using 64 bit file offsets
|
||||
#define __USE_FILE_OFFSET64
|
||||
#endif /* __USE_FILE__OFFSET64 */
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user