Skip to content
Snippets Groups Projects
Commit a427ff6a authored by Patrick Nossol's avatar Patrick Nossol
Browse files

Merge branch 'develop' into 5.1 

# Conflicts:
#	Content/MoCapMap.umap
#	Source/MoCapPlugin/Private/MCController.cpp
#	Source/MoCapPlugin/Private/MCRigUnits.cpp
parents fe8be6af 43651a83
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 657 additions and 454 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment