Merge master into jwst branch

This commit is contained in:
Malin Ejdbo
2021-05-03 10:03:50 +02:00
parent f77074757b
commit 1f96920b83
560 changed files with 23410 additions and 23495 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
return {
{
Type = "ConvertRecFormatTask",
InputFilePath = "../../recordings/input",
OutputFilePath = "../../recordings/output"
}
{
Type = "ConvertRecFormatTask",
InputFilePath = "../../recordings/input",
OutputFilePath = "../../recordings/output"
}
}