Merge pull request #1 from WilliamRagstad/release

Renamed namespace
WilliamRagstad · Dec 2, 2019 · 9b08f8a · 9b08f8a
2 parents 103beb3 + 70275a1
commit 9b08f8a
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 13 deletions.
diff --git a/CSGO Font Manager.sln b/CSGO Font Manager.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27428.2015
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSGO Font Manager", "CSGO Font Manager 2.0\CSGO Font Manager.csproj", "{BC394694-0ADC-43A7-878E-C129D28E1142}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSGO Font Manager", "CSGO Font Manager\CSGO Font Manager.csproj", "{BC394694-0ADC-43A7-878E-C129D28E1142}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/CSGO Font Manager/CSGO Font Manager.csproj b/CSGO Font Manager/CSGO Font Manager.csproj
@@ -90,6 +90,7 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/CSGO Font Manager/ClassDiagram1.cd b/CSGO Font Manager/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
diff --git a/CSGO Font Manager/DragAndDrop.cs b/CSGO Font Manager/DragAndDrop.cs
@@ -18,7 +18,7 @@
 using System.Windows.Forms;
 
 
-namespace CSGO_Font_Manager_2._0
+namespace CSGO_Font_Manager
 {
     public partial class Form1
     {

diff --git a/CSGO Font Manager/FileTemplates.cs b/CSGO Font Manager/FileTemplates.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CSGO_Font_Manager_2._0
+namespace CSGO_Font_Manager
 {
     class FileTemplates
     {

diff --git a/CSGO Font Manager/Form1.Designer.cs b/CSGO Font Manager/Form1.Designer.cs
diff --git a/CSGO Font Manager/Form1.cs b/CSGO Font Manager/Form1.cs
@@ -12,7 +12,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 
-namespace CSGO_Font_Manager_2._0
+namespace CSGO_Font_Manager
 {
     public partial class Form1 : Form
     {

diff --git a/CSGO Font Manager/Program.cs b/CSGO Font Manager/Program.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CSGO_Font_Manager_2._0
+namespace CSGO_Font_Manager
 {
     static class Program
     {

diff --git a/CSGO Font Manager/bin/Debug/CSGO Font Manager.exe b/CSGO Font Manager/bin/Debug/CSGO Font Manager.exe
diff --git a/CSGO Font Manager/bin/Debug/CSGO Font Manager.pdb b/CSGO Font Manager/bin/Debug/CSGO Font Manager.pdb
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.CopyComplete b/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.CopyComplete
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.FileListAbsolute.txt b/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.FileListAbsolute.txt
@@ -0,0 +1,15 @@
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\CSGO Font Manager.exe.config
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\CSGO Font Manager.exe
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\CSGO Font Manager.pdb
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\ActiproSoftware.Shared.WinForms.dll
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\ActiproSoftware.SyntaxEditor.WinForms.dll
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\ActiproSoftware.Shared.WinForms.xml
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\bin\Debug\ActiproSoftware.SyntaxEditor.WinForms.xml
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.csprojResolveAssemblyReference.cache
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO_Font_Manager.Form1.resources
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO_Font_Manager.Properties.Resources.resources
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.csproj.GenerateResource.cache
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.csproj.CoreCompileInputs.cache
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.csproj.CopyComplete
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.exe
+D:\Documents\Visual Studio repos\CSGO Font Manager\CSGO Font Manager\obj\Debug\CSGO Font Manager.pdb
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.GenerateResource.cache b/CSGO Font Manager/obj/Debug/CSGO Font Manager.csproj.GenerateResource.cache
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.csprojResolveAssemblyReference.cache b/CSGO Font Manager/obj/Debug/CSGO Font Manager.csprojResolveAssemblyReference.cache
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.exe b/CSGO Font Manager/obj/Debug/CSGO Font Manager.exe
diff --git a/CSGO Font Manager/obj/Debug/CSGO Font Manager.pdb b/CSGO Font Manager/obj/Debug/CSGO Font Manager.pdb
diff --git a/CSGO Font Manager/obj/Debug/CSGO_Font_Manager.Form1.resources b/CSGO Font Manager/obj/Debug/CSGO_Font_Manager.Form1.resources
diff --git a/CSGO Font Manager/obj/Debug/CSGO_Font_Manager.Properties.Resources.resources b/CSGO Font Manager/obj/Debug/CSGO_Font_Manager.Properties.Resources.resources
diff --git a/CSGO Font Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CSGO Font Manager/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/CSGO Font Manager/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/CSGO Font Manager/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<ClassDiagram />