Commit 4344fccd authored by J. Fernando Sánchez's avatar J. Fernando Sánchez
Browse files

Merge branch 'master' into 'senpy'

# Conflicts:
#   makefiles.mk
parents 7444aa7e 473efd8d
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment