Merged with dev, resolved conflicts, fixes to icon refs

Browse Source

...

This commit is contained in:

Thanatomanic

2018-08-13 05:11:21 +02:00

parent aed90f29ea f70cdd0116

commit 770c16e430

2153 changed files with 48472 additions and 193956 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

1968

rtgui/options.cc

File diff suppressed because it is too large Load Diff