Skip to content
Snippets Groups Projects
Commit 0ab6904c authored by Malte Christian Kögel's avatar Malte Christian Kögel
Browse files

Merge branch 'dev/5.3' of...

Merge branch 'dev/5.3' of https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/plugins/unreal-study-framework into dev/5.3

# Conflicts:
#	Source/StudyFrameworkPlugin/Private/SFParticipant.cpp
#	Source/StudyFrameworkPlugin/Public/SFParticipant.h
parents 74568647 1c37cd09
Branches
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment