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

Merge remote-tracking branch 'origin/1.7' into 1.8

Browse Source 
# Conflicts:
#	Flax.flaxproj
This commit is contained in:
Wojciech Figat
2023-11-25 23:36:56 +01:00
parent 37d4b0f863 b3a18883ca
commit 76f5712c79
60 changed files with 391 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Flax.flaxproj
+1 -1
View File
@@ -4,7 +4,7 @@
"Major": 1,
"Minor": 8,
"Revision": 0,
"Build": 6502
"Build": 6503
},
"Company": "Flax",
"Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",