Merge remote-tracking branch 'upstream/master' into pull_requests

Browse Source

# Conflicts:
#	io/previewgenerator.cpp
#	ui/renderfunctions.cpp

...

This commit is contained in:

Jonathan Noble

2019-02-19 08:57:47 +00:00

parent 52c2fee142 b848116c63

commit a77901e421

1052 changed files with 114058 additions and 5446 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

ui/renderfunctions.cpp

+606 -458

File diff suppressed because it is too large Load Diff