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

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

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/moviebrowser/mb.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 30e1c0ef71
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-29 12:45:02 +02:00
parent da08c55473 0e9db1640b
commit f7614da769
9 changed files with 413 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals_intern.h
View File

@@ -1823,6 +1823,7 @@ const char * locale_real_names[] =
"moviebrowser.book_type",
"moviebrowser.book_type_backward",
"moviebrowser.book_type_forward",
"moviebrowser.browser_additional",
"moviebrowser.browser_frame_high",
"moviebrowser.browser_row_head",
"moviebrowser.browser_row_item",