Merge remote-tracking branch 'tuxbox/master'

Browse Source

* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)

...

This commit is contained in:

Stefan Seyfried

2016-10-22 11:37:40 +02:00

parent 576ef77919 1c976d8579

commit 54189f271a

346 changed files with 13372 additions and 6088 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4167

src/gui/moviebrowser/mb.cpp Normal file

File diff suppressed because it is too large Load Diff