Skip to content
Snippets Groups Projects
Commit 515658b2 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

Merge branch 'dev/5.5' into 'dev/5.4' 

# Conflicts:
#   .gitlab-ci.yml
parents ecc4a6f7 8c8451a3
Branches
No related tags found
2 merge requests!6Pull 5.4 changes into 5.5,!5Release dev to main branch
Pipeline #524387 passed
Stage: analyze
Stage: generate
Stage: build
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.gitlab-ci.yml
+ 2
− 2
View file @ 515658b2
...@@ -40,7 +40,7 @@ include: ...@@ -40,7 +40,7 @@ include:
# Use the UNREAL_VERSION variable to adjust to your preferred Unreal version. # Use the UNREAL_VERSION variable to adjust to your preferred Unreal version.
variables: variables:
UNREAL_VERSION: "5.4" UNREAL_VERSION: "5.5"
stages: stages:
- analyze - analyze
...@@ -81,7 +81,7 @@ Generate_Project: ...@@ -81,7 +81,7 @@ Generate_Project:
RUN_SETUP: "false" RUN_SETUP: "false"
GEN_DEPENDENCIES: "( GEN_DEPENDENCIES: "(
[master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git' [master@UnrealDTrackPlugin]='https://github.com/VRGroupRWTH/UnrealDTrackPlugin.git'
[dev/5.4@RWTHVRToolkit]='https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/plugins/rwth-vr-toolkit.git' [dev/5.5@RWTHVRToolkit]='https://git-ce.rwth-aachen.de/vr-vis/VR-Group/unreal-development/plugins/rwth-vr-toolkit.git'
)" )"
Generate_Project_Without_Toolkit: Generate_Project_Without_Toolkit:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment