Merge branch 'master' into pu/mp

Browse Source

...

This commit is contained in:

Jacek Jendrzej

2017-06-18 12:21:18 +02:00

parent a70f3cb025 326a9634e1

commit d612fbc05f

8 changed files with 847 additions and 876 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

932

src/gui/audioplayer.cpp

File diff suppressed because it is too large Load Diff