Update submodules from master to solve merge conflict issues

Browse Source

...

This commit is contained in:

Ylva Selling

2021-04-30 10:17:07 +02:00

parent 72d931e68d

commit 94101b783c

4 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

apps/OpenSpace/ext/sgct

+1 -1

Submodule apps/OpenSpace/ext/sgct updated: eefd275cce...669fbc16a9

ext/ghoul

+1 -1

Submodule ext/ghoul updated: 1625701baa...8f17cc57d9

modules/kameleon/ext/kameleon

+1 -1

Submodule modules/kameleon/ext/kameleon updated: 8a5e966659...606edb945b

support/coding/codegen

+1 -1

Submodule support/coding/codegen updated: b3c0a745fa...4b06f1ad45