recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00

Files

vanhofen 6bb52f0731 Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/driver/screenshot.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7102774beb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-15 (Wed, 15 Feb 2017)



------------------
This commit was generated by Migit

2017-02-15 22:54:00 +01:00

daemonc

…

driver

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-15 22:54:00 +01:00

eitd

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

2017-02-12 23:30:28 +01:00

gui

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-02-15 22:54:00 +01:00