recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00

Go to file

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

Conflicts:
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/epgview.h
	src/gui/eventlist.cpp


Origin commit data
------------------
Commit: 3210b958a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-03 (Wed, 03 May 2017)

2017-05-03 22:57:24 +02:00

data

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

2017-04-08 14:32:18 +02:00

doc

move src/timerd/doku.html to doc/timerd.html

2017-03-19 23:50:52 +01:00

lib

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

2017-04-26 11:17:46 +02:00

src

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

2017-05-03 22:57:24 +02:00

.gitignore

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

2017-03-15 22:47:35 +01:00

acinclude.m4

acinclude.m4: fix merge error

2017-03-23 19:00:57 +01:00

AUTHORS

…

autogen.sh

Revert "- autogen.sh: add 'autoreconf -fi' call"

2017-03-20 14:14:23 +01:00

autorun.sh

…

ChangeLog

…

configure.ac

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

2017-03-30 23:21:39 +02:00

COPYING

…

cross-configure.apollo.debug

…

cross-configure.cool

…

cross-configure.cool.debug

…

cross-configure.tuxbox

…

Makefile.am

…

NEWS

…

README

…

README.md

…

version_pseudo.h

remove screen_width/height from neutrino.conf; ...

2017-02-09 18:13:19 +01:00

README.md

Neutrino-HD ツ

Languages

C++ 85%

C 12.5%

Shell 0.6%

Makefile 0.6%

M4 0.5%

Other 0.7%