Merge remote-tracking branch 'tuxbox/master'

Browse Source

...

This commit is contained in:

Stefan Seyfried

2016-11-12 18:06:26 +01:00

parent 5257d14c13 ad7947d11a

commit 2c92d112d0

58 changed files with 6498 additions and 735 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

587

src/gui/timerlist.cpp

File diff suppressed because it is too large Load Diff