Merge branch 'master' into 'senpy'

Browse Source

# Conflicts:
#   makefiles.mk

pre-1.0

J. Fernando Sánchez 7 years ago

parent 7444aa7ec8 473efd8dd7

commit 4344fccd57

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

Diff Content Not Available