gav/real-shooter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/krazerleo/core/1' into krazerleo/core/1

Browse Source 
# Conflicts:
#	Assets/Resources/BillingMode.json.meta
#	Assets/Scenes/AnimationTestScene.unity.meta
#	ProjectSettings/ProjectVersion.txt
This commit is contained in:
Krazerleo
2022-05-09 21:34:46 +07:00
parent d617ddabe7 183de6485f
commit 3ed89a8c10
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2019.4.35f1
m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e)
m_EditorVersion: 2019.4.36f1
m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5)