Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	source/patcher/ControllerPatcherHID.cpp

...

This commit is contained in:

Maschell 2017-10-29 10:29:56 +01:00

parent f52849b3b1 30557cd770

commit 39efa6dd88

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available