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

2019-04-20 10:59:05 -05:00 · 2019-04-20 10:59:05 -05:00 · cd1aadef74
parent c965751911 1dd15d4abc
commit cd1aadef74
1 changed files with 14 additions and 0 deletions
--- a/src/xenia/base/main_init_posix.cc
+++ b/src/xenia/base/main_init_posix.cc
@ -0,0 +1,14 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include "xenia/base/main.h"
+
+#include <cstdlib>
+
+// Nothing. Stub.