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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-05-24 20:24:39 +02:00
parent f413d8ecc7 c0a1e42dce
commit 07ccb9a351
50 changed files with 1106 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -738,6 +738,7 @@ static const struct key keynames[] = {
{"KEY_NEXT", KEY_NEXT},
{"KEY_PREVIOUS", KEY_PREVIOUS},
{"KEY_TIME", KEY_TIME},
{"KEY_SLEEP", KEY_SLEEP},
{"KEY_AUDIO", KEY_AUDIO},
{"KEY_REWIND", KEY_REWIND},
{"KEY_FORWARD", KEY_FORWARD},