Merging //UE4/Dev-Main to Dev-Geometry (from CL: 3492074)

#rb none

[CL 3493369 by Mike Fricker in Dev-Geometry branch]
This commit is contained in:
Mike Fricker
2017-06-15 17:45:03 -04:00
parent cb60c57c48
commit fddcdcac09
5884 changed files with 213547 additions and 184356 deletions

View File

@@ -17,6 +17,9 @@ DEFINE_LOG_CATEGORY(LogCrashDebugHelper);
#elif PLATFORM_MAC
#include "CrashDebugHelperMac.h"
#elif PLATFORM_IOS
#include "CrashDebugHelperIOS.h"
#else
#error "Unknown platform"
#endif