Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into 1.6

Browse Source 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
This commit is contained in:
Wojciech Figat
2023-03-14 11:52:41 +01:00
parent b7a3b10498 1c27674fd5
commit 74758f5380
25 changed files with 545 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -5,6 +5,7 @@
obj/
Cache/
Binaries/
Output/
Logs/
Source/*.csproj
/Package_*/