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

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

Browse Source 
# Conflicts:
#	Flax.flaxproj
This commit is contained in:
Wojciech Figat
2026-01-13 14:29:44 +01:00
parent e721fbd89f 3cfc5db54a
commit 610c76578b
60 changed files with 6995 additions and 2145 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": 12,
"Revision": 0,
"Build": 6901
"Build": 6902
},
"Company": "Flax",
"Copyright": "Copyright (c) 2012-2026 Wojciech Figat. All rights reserved.",