From 0e0a007a2503d468391004c8ea2faae305232345 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner
Date: Sat, 6 Dec 2014 20:00:08 -0200
Subject: Add configurable per-class log filtering

---
 src/core/settings.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 7e7a66b89..138ffc615 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <string>
+
 namespace Settings {
 
 struct Values {
@@ -33,7 +35,7 @@ struct Values {
     // Data Storage
     bool use_virtual_sd;
 
-    bool enable_log;
+    std::string log_filter;
 } extern values;
 
 }
-- 
cgit v1.2.3


From ebfd831ccba32bce097491db3d6bdff0be05935e Mon Sep 17 00:00:00 2001
From: purpasmart96
Date: Tue, 16 Dec 2014 21:38:14 -0800
Subject: License change

---
 src/core/settings.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 138ffc615..4808872ae 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -1,5 +1,5 @@
 // Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
+// Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
-- 
cgit v1.2.3


From 3b9d181b8e0f1c3c2452497bdf65bbb65ab7c213 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Fri, 26 Dec 2014 21:40:17 -0500
Subject: GPU: Implement frameskip and remove forced framebuffer swap hack.

---
 src/core/settings.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/settings.h')

diff --git a/src/core/settings.h b/src/core/settings.h
index 4808872ae..4b8928847 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -31,6 +31,7 @@ struct Values {
     // Core
     int cpu_core;
     int gpu_refresh_rate;
+    int frame_skip;
 
     // Data Storage
     bool use_virtual_sd;
-- 
cgit v1.2.3