Merge branch 'master' into stylized-icons-main-bar

Browse Source

# Conflicts:
#	src/icons/skin/ratio.png

...

This commit is contained in:

Bert Verhelst

2016-03-28 15:07:31 +02:00

parent 95df9c5cf6 696ea0bf94

commit 0dd8f21511

482 changed files with 131779 additions and 104481 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

BIN

src/icons/skin/downloadLimit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 435 B

BIN

src/icons/skin/uploadLimit.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 406 B