From 845c5ef39a5bdc86ecd6fff8518043aa021a190f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Oct 2017 11:15:54 +0900
Subject: [PATCH] Update framework

---
 osu-framework       | 2 +-
 osu.sln.DotSettings | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 4489791c8f..f7aab38362 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 4489791c8f1299ee4cc045454f76bfd34940aabf
+Subproject commit f7aab38362a8f510b32340d45d35f8015c3a76b5
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index 4eeaa23a32..fdfbf25144 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -194,6 +194,8 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IPC/@EntryIndexedValue">IPC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=LTRB/@EntryIndexedValue">LTRB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=NS/@EntryIndexedValue">NS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RGB/@EntryIndexedValue">RGB</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RNG/@EntryIndexedValue">RNG</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SHA/@EntryIndexedValue">SHA</s:String>