Wojciech Figat eebc4951de Merge branch '1.5' into dotnet7 ...

# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs

2023-01-10 15:49:44 +01:00

..

CachedCustomAnimGraphNodesCollection.cs

Update copyright year

2023-01-10 15:29:37 +01:00

CachedTypesCollection.cs

Update copyright year

2023-01-10 15:29:37 +01:00

CodeDocsModule.cs

Merge branch '1.5' into dotnet7

2023-01-10 15:49:44 +01:00

CodeEditingModule.cs

Merge branch '1.5' into dotnet7

2023-01-10 15:49:44 +01:00

DefaultSourceCodeEditor.cs

Update copyright year

2023-01-10 15:29:37 +01:00

InBuildSourceCodeEditor.cs

Merge branch '1.5' into dotnet7

2023-01-10 15:49:44 +01:00

ISourceCodeEditor.cs

Update copyright year

2023-01-10 15:29:37 +01:00