From 767775988eaf2779805f12f2f337ca0d02386241 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Oct 2017 16:54:14 +0900
Subject: [PATCH] Add NS and OS as abbreviations

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

diff --git a/osu-framework b/osu-framework
index 0bc71f95b4..48ea66774c 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 0bc71f95b455d3829b2abf662b5fe25989e6c43c
+Subproject commit 48ea66774c76427b871b71c6c5f4e01ebecf1af2
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index c236ce82b0..7808ed200b 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -193,6 +193,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>