Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Resources/text/changelog.txt

...

This commit is contained in:

Kurt

2015-12-29 10:39:48 -08:00

parent a5e9ba0e06 bc3f8cb06c

commit af1ab5a8e3

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

Diff Content Not Available