Merge branch 'master' of https://github.com/CosmosOS/Cosmos

tgiphil · tgiphil · commit fbdb715873d5 · 2014-12-25T13:33:42.000-08:00
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig is awesome:
+http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use tabs as indentation
+# Trim trailing whitespace
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.cs]
+indent_size = 2
+
+[*.csproj]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -42,3 +42,4 @@ Build/VMWare/Workstation/Cosmos.vmxf
 
 Setup/Current.iss
 Cosmos.Assembler.Log
+UpgradeLog.htm

Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,4 @@ Build/VMWare/Workstation/Cosmos.vmxf`
`42`	`42`
`43`	`43`	`Setup/Current.iss`
`44`	`44`	`Cosmos.Assembler.Log`
	`45`	`+UpgradeLog.htm`