Skip to content
Commit 6bdc492f authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.4' into v2.5 

# Conflicts:
#	src/core/ActionSet.cpp
parents 876a584d bf8b1994
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment