birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stabilization/2106' into redcode/SPEC-7563

Browse Source
This commit is contained in:
Esteban Papp
2021-06-30 09:20:08 -07:00
parent d6caff7842 6392788212
commit 5fa495380c
55 changed files with 1182 additions and 972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Plugins/EditorCommon/EditorCommon.rc
BIN
View File
Binary file not shown.
Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin.h
+1 -4
View File
@@ -7,10 +7,7 @@
#pragma once
////////////////////////////////// CRYTEK ////////////////////////////////
//
// Crytek Engine Source File.
// Copyright (C), Crytek Studios, 2011.
////////////////////////////////////////////////////////////////////////////
// -------------------------------------------------------------------------
// File Name : FFMPEGPlugin.h
// Author : Jaewon Jung