Merge branch 'master' into stable

1 files changed, 14 insertions, 0 deletions

diff --git a/Source/Core/Common/GenericCPUDetect.cpp b/Source/Core/Common/GenericCPUDetect.cpp
new file mode 100644
index 0000000000..8c82fb8667
--- /dev/null
+++ b/Source/Core/Common/GenericCPUDetect.cpp
@@ -0,0 +1,14 @@
+// Copyright 2014 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "Common/CPUDetect.h"
+
+CPUInfo cpu_info;
+
+CPUInfo::CPUInfo() {}
+
+std::string CPUInfo::Summarize()
+{
+	return "Generic";
+}